I'm afraid of commits.
replyIt always ends up with a lot of blaming.
replyIn extreme cases, it terminates with a bisect.
You could wait a bit after forking.
replySquash commit can fix the conflict.
replyDoesn't work if there are too many diffs
replydeleted
replyDiffs can always be patched up.
reply