Three way merge with Beyond Compare?

[Michiel van Wessem]

Hello.

I would like to be able to do a three way merge with Beyond Compare for a files that are merged with changes in both the current branch and the branch that's being merged in.

Sometimes this will result in a merge conflict and then we have the option to start mergetool.

However, if the file was automatically merged, this doesn't necessarily mean there are no issues. 

I would like to be able to review the merge, as a three way merge. 

Currently I save all revisions using the command line and then, also from the command line, I start Beyond Compare. 

Is there a way to do this using Git Extensions? 

If not, can it be added?

Thank you.

Michiel van Wessem

[OldGrantonian]

Have a look in  Tools > Settings > Git Extensions > Git Config

I can see an option "Mergetool".

The default is "kdiff3", but I can see BC3 and BC4 in the dropdown.

Have a try. If you succeed keep a note of what you did, and report back.

[Michiel van Wessem]

Of course, I have that set.

To rephrase my question or request:

How do you start the configured mergetool for a file that was merged automatically and did not have merge conflicts?

The absence of merge conflicts does not always indicate a successful merge, so we'd like to be able to review.

I believe this is straightforward in TFS.

Michiel van Wessem

--
You received this message because you are subscribed to a topic in the Google Groups "GitExtensions" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/gitextensions/34dlMWUcKLA/unsubscribe.
To unsubscribe from this group and all its topics, send an email to gitextension...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Arkady Shapkin]

Git allow run only diff tool after merge. Select file in commit dialog and than click to "Open with difftool"

вторник, 2 сентября 2014 г., 18:38:26 UTC+4 пользователь Michiel van Wessem написал:

To unsubscribe from this group and all its topics, send an email to gitextensions+unsubscribe@googlegroups.com.