Had to rebase to change an early commit message so everyone needs to run this command in their local repo: `git pull origin master -X theirs` Tell me if anything goes horribly wrong.
Had to rebase to change an early commit message so everyone needs to run this command in their local repo:
git pull origin master -X theirsTell me if anything goes horribly wrong.