| 98 | As you are working on a change, other changes will likely be added to the trunk repository. |
| 99 | You may need some of those changes, or may just want to be sure your work fits in smoothly with them, |
| 100 | or you may be preparing to submit your changes as a pull request to trunk. |
| 101 | In these cases, you'll want to update the branch you're working on to include new revisions from trunk |
| 102 | that are not yet in your local repository. |
| 103 | The process for doing this is first "fetching" -- copying from the remote repository -- the new revisions |
| 104 | from trunk, then either "rebasing" or "merging" to include them in the branch you want to update. |
| 105 | |
| 106 | Rebasing lifts your commits off of the common base your branch shared with trunk, then inserts the new |
| 107 | trunk revisions, then applies your commits on top of those. Merging leaves your commits where they are, |
| 108 | and adds the trunk revisions alongside them. |