Git環境配置

第一步：

生成ssh key，使用命令 “ssh-keygen -t rsa -C “[email protected]””，your_email是你的email預設在使用者的家目錄下.ssh/id_rsa.pub檔案裡面

第二步：

回到github，進入Account Settings，左邊選擇SSH Keys，Add SSH Key,title隨便填，貼上key。

第三步：

測試ssh key是否成功，使用命令“ssh -T [email protected]”，如果出現You’ve successfully authenticated, but GitHub does not provide shell access 。這就表示已成功連上github。

如果出現“Agent admitted failure to sign using the key.Permission denied (publickey).”這個錯誤的話，在命令列下執行”ssh-add”，這樣就可以了。

第四步：

配置Git的配置檔案，username和email

git config --global user.name "your name"   //配置使用者名稱
git config --global user.email "your email"    //配置email 

clone至本地以及push到Github

clone

git clone
 
 https://github.com/chenguolin/scrapy.git

git pull origin master

push

git add xxx

git commit -m

git push origin master

程式碼衝突常見解決方法

如果系統中有一些配置檔案在伺服器上做了配置修改,然後後續開發又新新增一些配置項的時候,

在釋出這個配置檔案的時候,會發生程式碼衝突:

error: Your local changes to the following files would be overwritten by merge:
protected/config/main.php
Please, commit your changes or stash them before you can merge.

如果希望保留生產伺服器上所做的改動,僅僅併入新配置項, 處理方法如下:

git stash
git pull
git stash pop
然後可以使用Git diff -w +檔名 來確認程式碼自動合併的情況.

反過來,如果希望用程式碼庫中的檔案完全覆蓋本地工作版本. 方法如下:

git reset –hard
git pull
其中git reset是針對版本,如果想針對檔案回退本地修改,使用

git checkout HEAD file/to/restore  

英文版pull和push教程

In below section, I am writing step by step how I pushed the code in Github repo successfully
Follow the given below steps from where(Desktop/Server) you want to push the code into Github repo :

Step 1:

Clone the github repo into your system. (You should first create a repo in Github)

Get repo url at right hand sidebar of your repo page. Replace your github repo’s HTTPS url with https://github.com/USER-NAME/REPO-NAME.git

git clone https://github.com/USER-NAME/REPO-NAME.git

For EXAMPLE:

git clone https://github.com/sharadchhetri/testrepo.git

After cloning will be finished, you will find the directory name matching with the name of Github repo name you just cloned.

Step 2 : （Unnecessary）

Copy your code or files to REPO-NAME directory

For example, I have saved my codes in my desktop at /home/sharad/MyCode directory. Here, I am copying all codes and child directories into REPO-NAME directory .

cp -rvf /home/sharad/MyCode/* /home/sharad/testrepo

Step 3 :

Change to git cloned directory i.e REPO-NAME.

cd REPO-NAME

Step 4 :

Set Github account username and email id for authentication

git config --global user.email "[email protected]"
git config --global user.name "Your-Github-UserName"

Step 5:

Set Github URL. (This section is actually solution of this problem)

git remote set-url origin https://[email protected]/Your-Github-UserNAme/REPO-NAME

For EXAMPLE.

git remote set-url origin https://[email protected].com/sharadchhetri/testrepo.git

Step 6:

Now add all files and directory by using below given command inside REPO-NAME directory
(There is a dot in command, can you see that!)

git add .

Step 7:

Now write comment on commit

git commit -m 'my first commit'

Step 8:

Now push the code in Github repo.
Be ready with your github account password because it will ask.

git push -u origin master

I hope the solution also work for you.