add
add some knowloge in pro-git.org
soleve the confict