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. 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'.
pgpB5nf1WVB54.pgp
Description: PGP signature
_______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
