Why do I get conflicts when I do git revert?
That’s actually not what revert does. Revert doesn’t “take you back to” that commit and pretend that subsequent commits didn’t happen. It applies a logical negation of a single commit – and that commit alone – leaving subsequent commits in place. Let’s say you have some initial commit of some file – let’s call it … Read more