3 ms·
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 ca
by baq 10y ago
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 10y agoBut 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 10y agoMost 'proper' IDEs have no or terrible merge tools.
- greyman 10y agoAnd terminal has better such tools?
- baq 10y agomy $WORK issued machine is a windows box and the software i work on is 99% Linux.
- greyman 10y agoI 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.