DEV Community

Discussion on: Learn git concepts, not commands

Collapse
gede_73 profile image
Fersu

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".

Collapse
unseenwizzard profile image
Nico Riedmann Author

Thanks!

Yes, I did mean merge and have fixed it. Thanks for catching that!