gawkworkflow: Updating

1 
1 4.5 Updating and Merging
1 ========================
1 
1 As you work on your branch, you will occasionally want to bring it up to
1 date with respect to 'master'.  This minor node discusses updating local
1 branches and handling merge conflicts.
1 

Menu

1 
· Rebasing                    Rebasing A Local Branch.
· Merge Conflicts             Dealing With Merge Conflicts.
1