* Stephen Bash <bash@xxxxxxxxxxx> wrote:
> Hi all-
>
> In my office we've recently run into three separate fixes
> required on our maintenance branch that should not be
> included in master (our normal workflow is to make changes
> on maint, tag, release, and then merge to master). Normally
> these "maint only" fixes are interspersed with commits that
> should go back into master. In the past the "maint only"
> commits were rare, so I'd carefully use "merge -s ours"
> to avoid including the "maint only" changes in master.
> But now I'm wondering if there's a better process/workflow?
Of course, there is: use topic branches and rebase.
Assuming you've found a bug in maint, which is also still
in master.
#1: for off a topic branch (for that bug) from maint
#2: fix the bug there
#3: rebase to latest maint (if changed meanwhile) and test carefully
#4: (ff-)merge your bugfix branch to maint
#5: rebase bugfix branch to master (maybe incremental, if they
went too far away from another) and test carefully
#6: (ff-)merge bugfix branch to master
#7: drop that topic branch, as you're done now.
cu
--
----------------------------------------------------------------------
Enrico Weigelt, metux IT service -- http://www.metux.de/
phone: +49 36207 519931 email: weigelt@xxxxxxxx
mobile: +49 151 27565287 icq: 210169427 skype: nekrad666
----------------------------------------------------------------------
Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html