git-hints.markdown

Initialize and sync from github

git init
git remote add origin git@github.com:something/something.git
git pull origin master

Make sure that git push pushes tags

git config --add remote.origin.push 'refs/tags/:refs/tags/'

Resetting

Reset to head (losing all local changes) git reset --hard HEAD

Resolving merge conflicts on pull

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

References

• Merging-with-Git
• keep-either-file-in-merge-conflicts