Can not do git pull with local changes, first stash or revert it
git pull
bzr shelve
git stash
bzr unshelve
git stash pop
bzr revert myfile.py
git checkout -- myfile.py
bzr revert
git checkout --
http://stackoverflow.com/a/2530073/147904