Changes between Version 37 and Version 38 of DeveloperGuidelines/Git


Ignore:
Timestamp:
04/12/12 08:28:44 (10 years ago)
Author:
Fran Boon
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v37 v38  
    4141}}}
    4242
     43Once 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
    4345=== Resolving Merge Conflicts ===
    4446If you encounter conflicts during the rebase, the conflicts will be tagged in the files with: