HN
Hacker News
Top
New
Best
Ask
Show
Jobs
Comment by Towaway69 | Hacker News Reader
Parent
Full thread
Towaway69
·
Squash commit can fix the conflict.
View on HN
mmh0000
·
Doesn't work if there are too many diffs
Towaway69
·
Diffs can always be patched up.
Reply on news.ycombinator.com