8Aug/110
Resolving git conflicts
If you do a rebase or a pull and it has a merge conflict do the following
1. Check for file that is having conflict
git status
2. Edit code that has conflict and git add
git add -a
3. Commit edit
git commit -am "Some message"
1Aug/110
Git configs
Because I never seem to remember them
Global git ignore
echo ".DS_Store" >> ~/.gitignore git config --global core.excludesfile ~/.gitignore
My info
git config --global user.name "Your Name Comes Here" git config --global user.email you@yourdomain.example.com
Colorized outputs
git config --global color.branch auto git config --global color.diff auto git config --global color.interactive auto git config --global color.status auto