Changes between Version 80 and Version 81 of DeveloperGuidelines/Git


Ignore:
Timestamp:
01/02/14 11:23:36 (8 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v80 v81  
    134134
    135135
    136 ==== Rebasing after pushing to !GitHub ====
    137 Squash your commits if they are not in between two executions of git pull or git merge:
     136==== Squashing and rebasing commits ====
     137Before submitting code to be included in the trunk repository, two things should be done:
     138* Rebase from trunk and deal with any merge conflicts.
     139* Squash all commits in your change into one commit. This removes any false steps and re-working, and packages the related work together.
    138140
    139141{{{