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.
When I use git mergetool it requires me confirm all merged files rather than simply accepting non conflicting merges and only prompting me to resolve conflicts, which is my preferred behavior.
Are there options/.switches to enable this?
— EDIT —
Perhaps this is nothing to do with git and is related to my choice of mergetool : KDiff?
I must have broken the config somehow haivng install Git4Windows and GitExtensions and just generally hacking away at it. A clean install of G4W sorting it all out.