[openstack]Merge conflict怎么处理

zycchen

　　之前给社区提了一个patch过了一段时间后，出现了merge confict的问题。这里不得不说openstack的文档真是好。





Resolving merge conflicts


  



UPDATED: 2016-11-25 06:51






Contents




　　If the change that you submitted has a merge conflict, you need to manually resolve it using git rebase.
　　Rebasing is used to integrate changes from one branch into another to resolve conflicts when multiple commits happen on the same file.







WarningNever do a rebase on public (master) branches.

• 
  You submit a change.
  
  
• 
  Somebody else submits a change and that change merges. Now your change has a merge conflict.
  
  
• 
  Update your local repository:
  
  
  
  
  
  $ git remote update
  $ git pull --ff-only origin master
  
  
• 
  Download your change:
  
  
  
  
  
  $ git review -d $PARENT_CHANGE_NUMBER
  
  
• 
  Rebase your change:
  
  
  
  
  
  $ git rebase origin/master
  
  
• 
  Resolve conflicts manually:
  　　Conflicts are marked in a file with clear line breaks:
  
  
  
  
  
  <<<<<<< HEAD
  Second line.
  =======
  Third line.
  >>>>>>> feature/topic branch.
  
  　　<<<<<<<: Indicates the start of the lines that had a merge conflict.
  　　=======: Indicates separation of the two conflicting changes.
  　　>>>>>>>: Indicates the end of the lines that had a merge conflict.
  　　You need to resolve a conflict by manually editing the file. You also need to delete the ‘<<<<<<<’, ‘=======’, and’>>>>>>>’ in the file.
  
  
• 
  Add the files to the stage:
  
  
  
  
  
  $ git add $FILENAME
  
  
• 
  Complete the rebase process:
  
  
  
  
  
  $ git rebase --continue
  
  
• 
  Send the rebased patch again for review:
  
  
  
  
  
  $ git review