Project-Id-Version: Trac 0.12
Report-Msgid-Bugs-To: trac-dev@googlegroups.com
POT-Creation-Date: 2008-01-30 09:20+0100
PO-Revision-Date: 2010-07-19 23:05+0200
Last-Translator: Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>
Language-Team: en_US <trac-dev@googlegroups.com>
Plural-Forms: nplurals=2; plural=(n != 1)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Generated-By: Babel 0.9.6

Warning: Can't synchronize with repository "(default)" (Unsupported version control system "git": Can't find an appropriate component, maybe the corresponding plugin was not enabled? ). Look in the Trac log for more information.

Changes between Version 7 and Version 8 of DevHelp


Ignore:
Timestamp:
01/04/13 16:24:28 (5 years ago)
Author:
sebastian
Comment:

Add comments about git branching

Legend:

Unmodified
Added
Removed
Modified
  • DevHelp

    v7 v8  
    1919 
    2020If you are not able to send a pull request send a patch file of your changes to support at phtagr.org via email. And if you are not able to send a patch file file you can send your complete file with changes to support at phtagr.org via email. 
     21 
     22== Git Branching == 
     23 
     24With git you developing new features on a separate branch an your forked repository. The advantage is that a branch can easily merged to a master and can be updated from the master. A rough workflow look like 
     25 
     26 - Create a fork from [https://github.com/xemle/phtagr xemle/phtagr]. See githubs doc [https://help.github.com/articles/fork-a-repo Fork a repo] 
     27 - Open a branch by `git checkout -b new-feature` 
     28 - Push your changes to your branch of your repository 
     29 - Open a pull request to contribute your changes 
     30 - Merge from time to time your fork and branch with the upstream repository [https://github.com/xemle/phtagr xemle/phtagr] 
     31 
     32To get an idea have a look at [http://nvie.com/posts/a-successful-git-branching-model Git branching model] 
    2133 
    2234== Git Commit Message ==