updated git pull -Xtheirs
added tips for subversion