Looking for an analogue of Tower for Windows (merge functionality)?

K

Konstantin2012-04-20 16:22:31

git

Konstantin, 2012-04-20 16:22:31

Faced the problem of the lack of a sane git client for Windows, which would have rich merge functionality. In this regard, I am completely satisfied with the functionality that is implemented in the Tower for Mac OS X. But do not buy a MacBook because of one Tower.
At the moment, I have Tortoise Git, in which the functionality of the merge is not even close to Tower.
A cursory search on Google showed that there are no sane analogues of TortoiseMerge and TortoiseDiff, and if there are, then I did not find them.
Therefore, I turn to the habra community for help. Tell us what you merge with, huh?

Reply

Answer the question

In order to leave comments, you need to log in

4 answer(s)

A

alternativshik, 2012-04-20
@alternativshik

git merge

I

ixSci, 2012-04-20
@ixSci

I have just successfully replaced the default merge from tortoise with winmerge. So, you can use any third-party merge client. Of which there are a great many. The main thing is that they understand the parameters at startup.

K

kuzemchik, 2012-04-21
@kuzemchik

phpstorm has a good merge, I think in the cheapest version (web storm) it is the same.

T

tenzink, 2012-04-21
@tenzink

git extensions is conveniently configurable to use any merge program. There are preset settings for winmerge/araxis merge