Changes between Version 43 and Version 44 of DeveloperGuidelines/Git


Ignore:
Timestamp:
04/26/12 05:27:01 (10 years ago)
Author:
Michael Howden
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v43 v44  
    1616}}}
    1717
     18[[Image(https://docs.google.com/drawings/pub?id=1TppJKr9Qrq6I2KpkljRixx5gYh1seRqCXk8KDWdeIF0&w=960&h=720)]]
     19
    1820=== Ongoing Coding ===
    1921We suggest adopting the [http://blog.hasmanythrough.com/2008/12/18/agile-git-and-the-story-branch-pattern Story Branch] pattern, which allows squashing commits in order to keep the main Trunk as clean as possible
     
    5557}}}
    5658
     59[[Image(https://docs.google.com/drawings/pub?id=1Vhvm1EmqWOVNZkZsiJ0MLLpdTl6H_ya263Tdb2HK1N0&w=960&h=720)]]
     60
    5761Once 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:
    5862* https://github.com/mygitusername/eden/pull/new/<mystory>(the branch name)
     63
     64[[Image(https://docs.google.com/drawings/pub?id=1QmGeuQvFpg3pDQpM9xu81V7MlVy4uU8EzVIRqQ14MwU&w=792&h=353)]]
    5965
    6066==== Resolving Merge Conflicts ====