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.
The merge tool that come with smartgit is very confusing.
I am not able to configure kdiff3. I dont get to configure the common ancestor.
These are the only three files they give me to configure: ${mergedFile} ${rightFile} ${leftFile}
Is there a way to configure kdiff3 and use 3-way merge?
Actually SmartGit provides the
${baseFile}argument for 3-way merges (at least in version 3.0.x)In the Preferences panel, under Tools > Conflict Solver make sure External Conflict Solver is selected.