Changes between Version 40 and Version 41 of DeveloperGuidelines/Git


Ignore:
Timestamp:
04/12/12 19:02:34 (10 years ago)
Author:
Fran Boon
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v40 v41  
    6060Option2: [[BR]]
    6161Create a patch & apply this to a clean clone.
    62 === Resolving Merge Conflicts ===
     62
     63==== Resolving Merge Conflicts ====
    6364If you encounter conflicts during the rebase, the conflicts will be tagged in the files with:
    6465{{{
     
    106107Although 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]
    107108
    108 === Reverting to last committed code ===
     109==== Reverting to last committed code ====
    109110If you want to throw away all uncommitted changes (i.e. '{{{bzr revert}}}'), then:
    110111{{{