Jan Blechta <[email protected]> writes: > According to gitworkflows changes should be merged into the oldest > branch which requires them. I case of many bug fixes it should be > maint. It seems that this workflow is not followed. > > Is the reason that also contributors should base their work on bug fix > on maint branch (when applicable) instead of starting with master?
Yes, I start bug fix branches using either $ git checkout -b jed/fix-frotz oldest-applicable-maint or $ git checkout -b jed/fix-frotz $commit_that_introduced_bug This way it can be merged to the maximum number of places. If the bug is very old, perhaps where the code was refactored without affecting the bug, then it might be a lot of effort to fix the bug so far back and it wouldn't be an easy merge anyway. In that case, I suggest starting the bug fix wherever you know that you'll want to merge it and backporting if there is sufficient demand. > On the other hand new feature is appropriate to base on master, isn't > it? Yes. _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
