Yep, hated perforce, but the merger is quite good. In fact so good that for a ti... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

xab9 on Jan 3, 2018 | parent | context | favorite | on: Fix All Conflicts: Easy-To-use CUI for Fixing Git ...

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.

partycoder on Jan 3, 2018 [–]

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.

Consider applying for YC's Spring batch! Applications are open till Feb 11.
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact