用git提交代码时，出现问题

Question

用git提交代码时， 出现your branch and origin/dev have deverged and have 3and 1different commit each， 怎么解决？不能用git pull

Answer 1

http://stackoverflow.com/questions/2452226/master-branch-and-origin-master-have-diverged-how-to-undiverge-branches