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