Hacker News
new
|
past
|
comments
|
ask
|
show
|
jobs
|
submit
login
Automatic Git conflict resolution on logs and sets
(
a3nm.net
)
1 point
by
erwan
on Sept 27, 2017
|
hide
|
past
|
favorite
|
1 comment
stephenr
on Sept 27, 2017
[–]
Isn't the same achieved just by using `somefile*.txt merge=union` in the .gitattributes file?
Join us for
AI Startup School
this June 16-17 in San Francisco!
Guidelines
|
FAQ
|
Lists
|
API
|
Security
|
Legal
|
Apply to YC
|
Contact
Search:
