Git常见问题：Your branch and ‘xxx/xxx‘ have diverged_your branch and have diverged

用户1操作

用户2操作

T1

git co -b brv_1

git co -b brv_1

T2

git add test2.java

git commit -m 'm2'

git push

T3

git add test1.java

git commit -m 'm1'

git push

Your branch and 'XXX' have diverged,

and have 1 and 1 different commits each, respectively.

(use "git pull" to merge the remote branch into yours)

T4

git pull

fatal: Not possible to fast-forward, aborting.