解决“merge conflict”的一种方法

Background: if you didn't run the "git pull origin master" before the first commit of the update, or didn't run "git pull origin master --rebase" when you want to upload new patch to an under review commit,  someone else edited and merged other code in the same file(s)， the code difference with the merged code in remote will be detected by Gerrit, then Gerrit reports "Merge Conflict" status. This page is written in order to tell you how to fix this issue.

Step 1:  Back to local master branch with the command "git checkout master" or re-clone it.

$: git checkout master

Step 2:  Run "git pull" to make sure local master branch is up to date as remote master.

$: git pull origin

Step 3:  Create a new local branch, for example "myexample" with the command "git checkout -b myexample". Then the git bash will show you are in it likes "arnold.huang@RSZ-ED-000247 MINGW64 /d/Automation Team/Automation (myexample)"

$: git checkout -b DEV

Step 4: Open the gerrit webpage which has the "merge conflict" issue, log in with your account and click the "Download" button, switch to "SSH" page, copy the pull command :

$:  git pull "xxxxxxxxxxxxxxxxxxx