Git: Pulling a rebased branch
问题 Let me describe my situation: Mr Blond and Mr Orange are working on branch A that branches out of the master branch on commit M1. Branch A has 2 commits: A1 and A2. M1 \ \ A1 - A2 Meanwhile, Mr Orange committed and pushed 2 more commits on the master branch, M2 and M3. M1 - M2 - M3 \ \ A1 - A2 Mr Blond pulls from the remote, and after a while decides to rebase onto the master branch: M1 - M2 - M3 \ \ \ \ A1 - A2 A1` - A2` Now A1` and A2` are the rebased commits that exist locally at Mr blond