4.5 Updating and Merging ======================== As you work on your branch, you will occasionally want to bring it up to date with respect to 'master'. This minor node discusses updating local branches and handling merge conflicts.
· Rebasing Rebasing A Local Branch. · Merge Conflicts Dealing With Merge Conflicts.