Resolving git “pseudo conflicts”
Win-Vector Blog 2013-12-20
Summary:
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 toolkit for a version control system than a complete proscriptive version control system (the missing pieces being the selection […]