git init
git remote add origin [email protected]:something/something.git
git pull origin master
git config --add remote.origin.push 'refs/tags/:refs/tags/'
Reset to head (losing all local changes) git reset --hard HEAD
If you want to just keep your copy
git checkout --ours file
git add file
git commit -m "blah"
git push origin master
If you want their copy
git checkout --theirs file
git add file
git commit -m "blah"
git push origin master