Changes between Version 38 and Version 39 of DeveloperGuidelines/Git


Ignore:
Timestamp:
04/12/12 08:30:25 (13 years ago)
Author:
Fran Boon
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • DeveloperGuidelines/Git

    v38 v39  
    4242
    4343Once you have pushed to your branch on GitHub, you will likely want this to be merged with Trunk - this should be done via a Pull Request. This is done on GitHub:
    44 * https://github.com/<username>/eden/pull/new/master
     44* https://github.com/mygitusername/eden/pull/new/master
     45
     46
     47If you didn't squash your commits, you may be asked to do so. This isn't directly possible once your code is Pushed, so instead you should create a patch & apply this to a clean cloen so that the pull request contains a single commit which is easy to review & applies cleanly.
    4548=== Resolving Merge Conflicts ===
    4649If you encounter conflicts during the rebase, the conflicts will be tagged in the files with: