Info Catalog gawkworkflow: Rebasing gawkworkflow: Updating

gawkworkflow: Merge Conflicts

 
 4.5.2 Dealing With Merge Conflicts
 ----------------------------------
 
 Sometimes, when merging from 'master' into your branch, or from a branch
 into 'master', there will be "merge conflicts".  These are one or more
 areas within a file where there are conflicting sets of changes, and Git
 could not do the merge for you.  In this case, the conflicted area will
 be delimited by the traditional conflict markers, '<<<', '===' and
 '>>>'.
 
    Your mission is then to edit the file and "resolve" the conflict by
 fixing the order of additions (such as in a 'ChangeLog' file), or fixing
 the code to take new changes into account.
 
    Once you have done so, you tell Git that everything is OK using 'git
 add' and 'git commit':
 
      $ git checkout feature/python        Move back to new, purely local branch
      $ git rebase master                  "Start over" from current master
      -| ... Kaboom! Conflict. FIXME: Show real output here
      $ gvim main.c                        Edit the file and fix the problem
      $ git add main.c                     Tell Git everything is OK now ...
      $ git commit                         ... and it's settled
      $ git rebase --continue              Continue the rebase
 
    The 'git rebase --continue' then continues the process of rebasing
 the current branch that we started in Rebasing.  It's not
 necessary if you are using 'git merge' (Points to remember).
 

Info Catalog gawkworkflow: Rebasing gawkworkflow: Updating