News for hackers. Stuff that matters.

A comment on Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts. Parent comment

Re:Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts by xab9 on Wednesday January 03, 2018 @02:07AM (#16059142)
Yep, hated perforce, but the merger is quite good. In fact so good that for a time I used it standalone on git and svn projects too.

Nowdays I'm using webstorm and it's differ/merger is very very good, but ymmv.

[ Parent | on HN ]
Re:Fix All Conflicts: Easy-To-use CUI for Fixing Git Conflicts by partycoder on Wednesday January 03, 2018 @03:14AM (#16059373)
IntelliJ (and specialized versions like Webstorm) has a very good diff tool, integration with version control, etc.

An underused feature is "local history", which is a local cache of all local changes. This can be a lifesaver sometimes.

[ Parent | on HN ]