---- 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 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 branch. But what to do after that?

  Should I maintain this hotfix branch forever or is it better to merge the 
hotfix somehow into the master branch? 

  Currently I have to integrate a hotfix for v1.0. It's about a feature, which 
was removed in v2.0. So I think it's not a good idea to merge it back to 
master. But is it really a good idea to maintain a long running branch for 
every version?

  For tips, I am grateful.

The classic response is Nvie's branching method 

If "Hotfix" is not a nice word in your local environment, try 
"Maintenance-V1.0", or similar (i.e. a socially acceptable name) as the name 
for the long running branch - you can still use hot-fix for the temporary 
branch that will be merged so the name carries local temporary meaning.


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to