Git basic

1. solve conflict

senario:

　　Adam checked out master branch,

　　then Bob checked out master branch,

　　then Adam modify a file, commit and push,

　　then Bob modify the same file,

　　then Bob need to commit, then pull, then manually resolve the conflit, then commit again, then push.

2. ignore a tracking file

http://stackoverflow.com/questions/9237345/how-do-i-ignore-pycharm-configuration-files-in-a-git-repository

for single file

git rm --cached [filename]

for folder

git rm --cached -r [folder]

Git basic

原文：http://www.cnblogs.com/phoenix13suns/p/4620646.html