Geek asks and answers

How do you repeat manual merging of only one file in mercurial?

When I merge in mercurial with a series of conflict resolution manually, sometimes I understand before I make an error by making an error in one or two files. Apart from the start and repetition of the whole merge, how can I say that mercurial pulled out a merge tool for a single file to allow me to repeat the conflict resolution manually?

+3
source share
1 answer

It was difficult for me to understand this from mercury help and google. In the end, I got it by trial and error, and thought that I would publish what I found out here.

To re-resolve a single file, a two-step process is required:

hg resolve -u <file>
hg resolve <file>
+3
source

More articles:


All Articles