HN
Hacker News
Top
New
Best
Ask
Show
Jobs
Comment by DonHopkins | Hacker News Reader
Parent
Full thread
DonHopkins
·
I'm afraid of commits.
View on HN
BeetleB
·
It always ends up with a lot of blaming.
In extreme cases, it terminates with a bisect.
dotancohen
·
You could wait a bit after forking.
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