Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
wetneb
77 days ago
|
parent
|
context
|
favorite
| on:
Mergiraf: a syntax-aware merge driver for Git
Yes, see this example:
https://mergiraf.org/conflicts.html#line-based-merges
Consider applying for YC's Spring batch! Applications are open till Feb 11.
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
