How can I see how many conflicts will result from a merge without actually performing the merge?
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.
How can I see how many conflicts will result from a merge without actually performing the merge?
The easiest way is to run the merge, and then abort if it didn’t work. There really isn’t any other way, because it requires the working directory.
You can stash your local changes, though, and you can easily discard the incomplete merge with
git reset --hard HEAD, so as not to lose changes or whatever.You can also use a new, throw-away branch to work out how much conflict there is without risking any of the current, active branches.