Changes between Version 84 and Version 85 of DeveloperGuidelines/Git

Timestamp:

01/02/14 11:55:25 (11 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -91 +91 @@
 [[BR]]
 https://docs.google.com/drawings/d/1QmGeuQvFpg3pDQpM9xu81V7MlVy4uU8EzVIRqQ14MwU/edit
+
+=== Detailed descriptions of workflow steps ===
+
+==== Rebasing from Trunk ====
+
 ==== Resolving Merge Conflicts ====
 If you encounter conflicts during the rebase, the conflicts will be tagged in the files with:
@@ -136 +141 @@
 }}}
 Although 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]
-
-
 
 ==== Squashing commits ====