On Tue, Jul 21, 2009 at 10:12 AM, Ken<[email protected]> wrote: > How do you handle bug fixes? Do you make your changes in the master > branch and then merge them into all of the "new feature" branches? > Or, do you make a new branch for each bug fix and then merge those > changes into the master branch and into each of the new feature > branches? I guess I'm confused on how you keep the new feature > branches up-to-date with bug fixes...
For bug fixes we just create a branch and fix the bug, then merge it into master. To ensure the feature branches get the fix, we just occasionally merge master into them. For instance: when I'm ready to merge a feature into master, I make a third branch (feature_merge) and merge in master then fix any conflicts. If that went smoothly I either replace master or merge the feature_merge branch into master then clean up by deleting the feature branches I created. So really: merge bugs into master then frequently merge master into feature branches. -- Chris Wanstrath http://github.com/defunkt --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/github?hl=en -~----------~----~----~----~------~----~------~--~---
