Changes between Version 58 and Version 59 of DeveloperGuidelines/Git


Ignore:
Timestamp:
05/23/12 11:17:53 (9 years ago)
Author:
Fran Boon
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v58 v59  
    5454
    5555# Squash commits to as few as possible to keep revision history clean & make it easier to review the work
     56# http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
    5657git rebase -i
    5758
     
    6465https://docs.google.com/drawings/d/1KElPNMq_annNSi_2f5r9grD-c0c_aZh1KBAOqSAtuPA/edit
    6566
    66 Once 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:
     67Once 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:
    6768* https://github.com/mygitusername/eden/pull/new/<mystory>(the branch name)
    6869