topic 分⽀ B Alice:git checkout master && git pull(Master is already up to date) Bob:git checkout master && git pull(Master is already up to date) Alice:git merge topic-branch-A Bob:git merge topic-branch-B Bob:git push origin master(在 Alice 之前) Alice:git push origin master(会被拒绝,因为这不是⼀个 fast-forward merge) Alice:git pull --rebase origin master(这时 Bob 的提交被拉下来,Alice 的提交放到 Bob 的后边) Alice:git push origin master(不会产⽣⽆⽤的 merge commit) 使⽤ git pull --rebase 的⼀个典型场景: