Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
cpeterso
on Jan 3, 2018
|
parent
|
context
|
favorite
| on:
Fix All Conflicts: Easy-To-use CUI for Fixing Git ...
Perforce's P4Merge is the least-worst (free) merge app I've found for Mac. I use it for git and hg. That said, I'm always open for recommendations for something better.
cpeterso
on Jan 3, 2018
[–]
btw, you can download P4Merge (aka "Helix Visual Merge Tool") here:
https://www.perforce.com/downloads/visual-merge-tool
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
