Changes between Version 85 and Version 86 of DeveloperGuidelines/Git


Ignore:
Timestamp:
01/02/14 12:39:29 (7 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

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