Changes between Version 81 and Version 82 of DeveloperGuidelines/Git


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

--

Legend:

Unmodified
Added
Removed
Modified
  • DeveloperGuidelines/Git

    v81 v82  
    8181
    8282Once 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:
    83 * https://github.com/mygitusername/eden/pull/new/<mystory>(the branch name)
     83* https://github.com/mygitusername/eden/pull/new/<mychanges>(the branch name)
    8484
    8585[[Image(https://docs.google.com/drawings/pub?id=1QmGeuQvFpg3pDQpM9xu81V7MlVy4uU8EzVIRqQ14MwU&w=792&h=353)]]
     
    9292# Commits from Trunk
    9393=======
    94 # Commits from <mystory>
    95 >>>>>>> "My Story"
     94# Commits from <mychanges>
     95>>>>>>> "My Changes"
    9696}}}
    9797You can correct these conflict in your code text editor, then add them andcontinue the rebase:
     
    189189}}}
    190190
     191=== Getting your changes accepted into the trunk repository ===
     192
     193Before submitting code to be included in the trunk repository, two things should be done:
     1941. Rebase from trunk and deal with any merge conflicts.
     1951. Squash all commits in your change into one commit. This removes any false steps and re-working, and packages the related work together.
     196
    191197=== Working with multiple branches ===
    192198If you are working on several tasks, or want to make temporary changes for experimentation,
     
    286292The [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.)
    287293{{{
    288 git checkout -b <mystory>
     294git checkout -b <mychanges>
    289295
    290296git commit -a