Next: Submitting Changes, Previous: Undoing a change, Up: Development without commit access [Contents][Index]
As you work on your branch, you will occasionally want to bring it
up to date with respect to master.
This section discusses updating local branches
and handling merge conflicts.
| • Rebasing | Rebasing A Local Branch. | |
| • Merge Conflicts | Dealing With Merge Conflicts. |