merged two branches, and pushed, how to backout/strip?
Uwe Brauer
oub at mat.ucm.es
Tue Jan 10 14:45:45 UTC 2017
>>> "Marcin" == Marcin Kasperski <Marcin.Kasperski at mekk.waw.pl> writes:
> Why is the whole machinery needed?
> From practical point of view, just update to pre-merge changeset, make
> some irrelevant commit there (so there is natural default continuation),
> bookmark merge changeset as preliminary change and be done. Development
> will continue from pre-merge changeset. Once you are really ready to
> merge you can use this merge as „partial trampoline” (continue from it
> instead of merging from scratch) and finally merge itself too.
Yeah but wouldn't that create a new head and make the graph uglier?
Uwe Brauer
More information about the Mercurial
mailing list