On 8 September 2013 17:14, Jed Brown <[email protected]> wrote: > Martin Sandve Alnæs <[email protected]> writes: > >> The right fix is to throw away the next branch. > > It sounds like commits were made directly in 'next', so throwing it away > would lose those commits.
Correct. Throwing away next is not the right thing to do. > I recommend finding those commits or series > and doing: > > $ git checkout -b my/topic-branch master > $ git cherry-pick SHA1_OF_TOPICAL_COMMITS > > When you're happy with the branch, merge it into 'next' and proceed as > usual. > >> Next should never be merged into master. > > Agreed. You don't want all the merge clutter of integrating to 'next' > to make it into 'master'. The point is that there is no clutter in next in this particular case. If there is not clutter in next, I don't see what harm can be done by merging next into main in this particular case. Garth _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
