Making sure you won't commit conflict markers

from blog meain/blog, | ↗ original
Recently I made a mistake of committing a conflict marker and pushing that code to Github. That is when I thought that I could have a easily avoided this if I had added a git-hook to warn me if the code that I commit had conflict markers. Here is how you would set up something like that. What are git-hooks? # In case you are new to git-hooks, it...