alt Hacker NewsAnd you can deal with them in any order, bit by bit, or by adjusting things in earlier commits. I no longer fear rebase conflicts.
And you can deal with them in any order, bit by bit, or by adjusting things in earlier commits. I no longer fear rebase conflicts.
I mean that's what I do in Git as well, I just don't do it by storing conflicts, but by not triggering them/ignoring them.