Fast-forwards when the local branch is an ancestor of the remote tip, and three-way merges when it has diverged. A non-current branch that is not a fast-forward is refused.
Fast-forwards when the local branch is an ancestor of the remote tip, and three-way merges when it has diverged. A non-current branch that is not a fast-forward is refused.