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? Certainly a well crafted alias or custom command makes the user's life easier, but still clutters master with "extra" merges.
Any thoughts? Thanks!
Stephen