The merge tool that understands your code

SCM System Integration

It would nice to be able to see:

- Branch names of files
- Log message
- Blame when requested
- Log of both versions when requested
- Self installation of Merge tool into Git

I believe Git support is crucial, followed by others.

18 votes
Vote
Sign in
(thinking…)
Sign in with: Facebook Google
Signed in as (Sign out)
You have left! (?) (thinking…)
Dan Cruver shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

1 comment

Sign in
(thinking…)
Sign in with: Facebook Google
Signed in as (Sign out)
Submitting...
  • psantosl commented  ·   ·  Flag as inappropriate

    Hi Dan,

    You can configure the tool to include what we call 'symbolic info' for each contributor.

    It means you can set it up to be invoked from Git so that it adds any meaningful info you want, for instance the names of the branches together with the file names.

    That being said, I see your points about the log message, the blame and the log. It is a really good idea. We've to figure out how to get it integrated with the tool but it really makes sense.

    Regarding the "self installation": yes, we didn't focus on that yet since we provide a guide to integrate with a bunch of different tools: http://www.semanticmerge.com/sm-guides/main.shtml but as you point is something worth the effort.

    Thanks!

Feedback and Knowledge Base