Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
|
from
login
Mergiraf: a syntax-aware merge driver for Git
(
mergiraf.org
)
432 points
by
p4bl0
5 months ago
|
past
|
87 comments
Mergiraf – a merge driver for Git that can solve a wide range of merge conflicts
(
mergiraf.org
)
2 points
by
sandebert
5 months ago
|
past
Join us for
AI Startup School
this June 16-17 in San Francisco!
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
