Merge Return in Mercurial

I did a merge, but then I filled it, so I decided to go back. I tried to return to one of the versions that I combined several times, but this will not work. It does not cause any errors, just my current state of the repository is still displayed as having two heads. I also tried deleting all the backup files that the reverse automatically creates. How can I restore my repository to a clean state on one of the heads?

+3
source share
1 answer

Try hg update -Cfor one of the heads or any version.

To avoid the situation, instead of returning, you can simply fix the unwanted merge and then delete it later.

+3
source

Source: https://habr.com/ru/post/1765548/


All Articles