[baq]

I use vim via ssh and in tmux everyday. I mostly love it.

But sometimes there are merge conflicts. I've settled for xpra and kdiff3 as the mergetool. I just can't handle the problem without a GUI tool.

[greyman]

But isn't it still easier to use a proper IDE in the local machine with Linux/Windows/OSX gui and then just git push the code? What advantages does your setup have?

[krakensden]

Most 'proper' IDEs have no or terrible merge tools.

[greyman]

And terminal has better such tools?

[baq]

my $WORK issued machine is a windows box and the software i work on is 99% Linux.

[greyman]

I work from home and I voluntarily choosed exactly this setup. Windows desktop and IDE tools are more comfortable, but the "real" software runs on Linux VM.