Hi there! Nice post.
I think that you've made a mistake here:
"Should you ever realize in the middle of resolving conflicts that you actually don't want to follow through with the merge, you can just abort it by running git commit --abort"
I think you probably wanted to write: "git merge --abort".
Yes, I did mean merge and have fixed it. Thanks for catching that!
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.