Changes between Version 84 and Version 85 of DeveloperGuidelines/Git


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

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v84 v85  
    9191[[BR]]
    9292https://docs.google.com/drawings/d/1QmGeuQvFpg3pDQpM9xu81V7MlVy4uU8EzVIRqQ14MwU/edit
     93
     94=== Detailed descriptions of workflow steps ===
     95
     96==== Rebasing from Trunk ====
     97
    9398==== Resolving Merge Conflicts ====
    9499If you encounter conflicts during the rebase, the conflicts will be tagged in the files with:
     
    136141}}}
    137142Although on Windows this seems by default to produce UTF-16 files! ('UCS-2 Little Endian'). A script to make this process easier for Windows users is attached: [http://eden.sahanafoundation.org/attachment/wiki/DeveloperGuidelines/Git/merge.cmd merge.cmd]
    138 
    139 
    140143
    141144==== Squashing commits ====