On Mon, Mar 18, 2013 at 7:08 PM, Gary Gregory <[email protected]> wrote: > But you do not have to do it that way right? We could keep master to be the > same as trunk.
I agree with Ivan this is possible. I thought similar like you before two years. But actually I have meanwhile learned to value the workflow described here: http://nvie.com/posts/a-successful-git-branching-model/ Its great to work with branches, because you can commit even when it is a half finished feature. You would commit to a feature branch. When the feature branch is done you would bring it into the develop branch. Meanwhile I love feature branches. The separation from develop to master makes sense, esp when you want to create a hotfix. You could create a hotfix branch directly from the master, make the fix and finally release from hotfix and merge back to master. One should also mention that it is pretty common to delete branches when they are not longer of use. That said, I have had a couple of merge conflicts in the past, but they were all better to resolve than with svn. Git is not the solution for everything, but it is definitely giving some more cool mojo-power than svn. cheers Christian > G > > > On Mon, Mar 18, 2013 at 1:44 PM, Ivan Habunek <[email protected]> > wrote: >> >> On 18 March 2013 18:27, Ralph Goers <[email protected]> wrote: >> > Where are the processes that you use with Git documented? While I'm >> > very comfortable with SVN I am only passable on Git - I can happily work >> > with other people's stuff but I'm not sure what it takes to integrate >> > changes people make from their forks. >> >> Here's an example for accepting other people's work. >> >> We have an issue on the tracker: >> https://issues.apache.org/jira/browse/LOG4PHP-207 >> >> I got a patch from a person I trust and he asked me to merge it: >> 0001-LOG4PHP-207-Using-class-MongoClient-instead-of-Mongo.patch >> >> To apply the patch you download it to your project and run: >> git am --signoff >> 0001-LOG4PHP-207-Using-class-MongoClient-instead-of-Mongo.patch >> >> By adding --signoff, you will get a line similar to this in your commit >> message: >> Signed-off-by: Ivan Habunek <[email protected]> >> >> Vladimir also used --signoff when creating the patch (see the >> contributor guidelines I sent in the previous mail), so you get two >> lines at the bottom of the commit message: >> Signed-off-by: Vladimir Gorej <[email protected]> >> Signed-off-by: Ivan Habunek <[email protected]> >> >> That way, it's clearly visible who did participated in creating and >> merging the commit. >> >> Here's the commit in our repo: >> >> https://git-wip-us.apache.org/repos/asf?p=logging-log4php.git;a=commit;h=f6d602f465dfb78aef67b196ac5456ff6c2b945f >> >> Regards, >> Ivan > > > > > -- > E-Mail: [email protected] | [email protected] > JUnit in Action, 2nd Ed: http://bit.ly/ECvg0 > Spring Batch in Action: http://bit.ly/bqpbCK > Blog: http://garygregory.wordpress.com > Home: http://garygregory.com/ > Tweet! http://twitter.com/GaryGregory -- http://www.grobmeier.de https://www.timeandbill.de
