Backing Out a backwards merge on Mercurial

后端 未结 5 749
Happy的楠姐
Happy的楠姐 2020-12-04 05:49

How do you reverse the effect of a merge on polarised branches without dying of agony?

This problem has been plaguing me for months and I have final

5条回答
  •  春和景丽
    2020-12-04 06:31

    So you want to merge just some changesets from B into A? Backing out changesets like you have been doing is a really bad idea as you have already suffered.

    You should either use the transplant extension or have a third branch where you make common changes to merge into both A and B.

提交回复
热议问题