Re: [git-users] Hotfix in a develop/master branch model for old version

2015-02-16 Thread Gergely Polonkai
Hello, I would create a release branch (as suggested by Philip). After this, you fix the bug on either master or version-1.0, and cherry-pick the change to every other branches. This way you can close version-1.0 branch after a maintenance period (like by telling your customer that sorry, we no lo

Re: [git-users] Hotfix in a develop/master branch model for old version

2015-02-16 Thread Philip Oakley
Original Message - From: bernd.petter...@gmail.com To: git-users@googlegroups.com Sent: Monday, February 16, 2015 8:52 AM Subject: [git-users] Hotfix in a develop/master branch model for old version I'm quite new to git. For a project I use git with a dev branch. If it

[git-users] Hotfix in a develop/master branch model for old version

2015-02-16 Thread bernd . petterson
I'm quite new to git. For a project I use git with a dev branch. If it get's stable, it is merged to master. Now I have to maintain different versions of the software. (for example v1.0 and v2.0) What is the best way to handle a hotfix for the old version v1.0? I know, I can create a hotfix