0

Better integration with external diff/merge tools on working tree and conflict resoving

David Saada 4 years ago updated 4 years ago 1

First of all, I really like SmartGit. As a long time command line fanatic, I find that SmartGit replaced the vast majority of the operations I used to perfrorm via CLI. Yet, there are places where I need to go back to CLI and the following two are examples to that. This is related to the SmartGit integration with external diff/merge tools (like Beyond Compare), which is all in all quite decent. Yet, I think it lacks in two aspects:

1. Difference with work tree files: When showing the difference between two commits (using "Show Changes" on the files), SmartGit generates temporary files. This is also the case when comparing a commit with the working tree. However, in this case, it would be much better if the working tree files were given themselves to the external tool and not temporary copies of them. This would allow the editing of the working tree files inside the tool, which is commonly used. This feature is also very much required, due to the inability to compare multiple files in a commit with working tree (can only do it one by one).

2. Conflict resolving: This is a bit harder to explain, but there's a big difference in the results I'm getting when opening conflict resolver from SmartGit (opening the external merge tool) and opening it from command line (using "git mergetool"). The latter works as expected, while the one opened from SmartGit is all over the place.

1. Please right-click the file in SmartGit's log and select Compare with Working Tree.

2. Please provide a sample repository to smartgit@syntevo.com. Thanks in advance.

1. Right, but you can only do it on one file at a time only. You can't select a commit or multiple files to do that (the option is grayed out). Quite inconvenient if there are many files in the commit.

2. Will try to supply a concrete example for that.