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".
Thanks!
Yes, I did mean merge and have fixed it. Thanks for catching that!
merge
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
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".
Thanks!
Yes, I did mean
mergeand have fixed it. Thanks for catching that!