I know that I should use git add after the conflict is resolved. I’ve recently noticed the trustExitCode option for mergetool. When the selected mergetool returns good exit code do I still need to use git add ?
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 know that I should use git add after the conflict is resolved. I’ve recently noticed the trustExitCode option for mergetool. When the selected mergetool returns good exit code do I still need to use git add ?
I found that I don’t need to
git addafter I resolved the conflict using amergetoolwith a trusted exit code.If the merged file was not touched by the
mergetool, Git will ask you if the merge was successful nonetheless. In this case, if you tell it that the merge was successful, Git will automatically add the merged file.