I’d like a quick way to know how many conflicts I will need to merge manually. Is this built-in? Or is there an existing tool to use as the merger to just count this?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I’d like a quick way to know how many conflicts I will need to merge manually. Is this built-in? Or is there an existing tool to use as the merger to just count this?
There’s no built in predictor command, as it would take as much effort computationally as doing the merge. However, if you do a
hg --config ui.merge=internal:fail mergeit will exit immediately and you can do ahg resolve --list.That will show you what you’re in for, and you can either continue with
hg resolve --allor give up withhg update -C .