Changes between Version 81 and Version 82 of DeveloperGuidelines/Git

Timestamp:

01/02/14 11:29:22 (11 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -81 +81 @@
 
 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:
-* https://github.com/mygitusername/eden/pull/new/<mystory>(the branch name)
+* https://github.com/mygitusername/eden/pull/new/<mychanges>(the branch name)
 
 [[Image(https://docs.google.com/drawings/pub?id=1QmGeuQvFpg3pDQpM9xu81V7MlVy4uU8EzVIRqQ14MwU&w=792&h=353)]]
@@ -92 +92 @@
 # Commits from Trunk
 =======
-# Commits from <mystory>
->>>>>>> "My Story"
+# Commits from <mychanges>
+>>>>>>> "My Changes"
 }}}
 You can correct these conflict in your code text editor, then add them andcontinue the rebase:
@@ -189 +189 @@
 }}}
 
+=== Getting your changes accepted into the trunk repository ===
+
+Before submitting code to be included in the trunk repository, two things should be done:
+1. Rebase from trunk and deal with any merge conflicts.
+1. Squash all commits in your change into one commit. This removes any false steps and re-working, and packages the related work together.
+
 === Working with multiple branches ===
 If you are working on several tasks, or want to make temporary changes for experimentation,
@@ -286 +292 @@
 The [http://blog.hasmanythrough.com/2008/12/18/agile-git-and-the-story-branch-pattern Story Branch] pattern allows pushing interim work to !GitHub for review & also allowing contributing quick fixes to Trunk without disturbing your longer-term work. (The linked story branch description uses a Ruby on Rails (RoR) project as an example, so you'll see RoR commands in the post, such as {{{rake}}} or {{{rake db:migrate}}}.  In most cases where an RoR command is shown, an appropriate Eden substitute will be to update from Trunk and run tests.)
 {{{
-git checkout -b <mystory>
+git checkout -b <mychanges>
 
 git commit -a