win-vector.com
Resolving git “pseudo conflicts”
I strongly advise using version control, and usually recommend using git as your version control system. Usually I feel a bit guilty about this advice as git is so general that it is more of a tool…