I have never had an issue with git pull. With proper communication and push/pull etiquette, there will rarely be conflicts and when there are, just rebase. I do

I have never had an issue with git pull. With proper communication and push/pull etiquette, there will rarely be conflicts and when there are, just rebase. I don't think it is ever ok to force a push. If you are having trouble reviewing others commits then try using gitx to view the changes in an easy to read way. I like that it doesn't remove deleted branches because sometimes I still want it when the rest of the team doesn't. I'm not convinced..