Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
idoubtit
on May 14, 2019
|
parent
|
context
|
favorite
| on:
Oh shit, git (2016)
Even without plugin in a three-ways tool, Git's conflict can provide more information.
[merge] # display 3 parts for each conflict, # including the common ancestor conflictstyle = diff3
There's also the option to use a semantic merge tool. AFAIK, there are only paying tools for this, and only a few languages are supported.
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search: