git pull is not normally what you use to merge branches, so it's unclear what's actually happening here. Could you show us the actual commands you ran?
↧
Comment by Schwern on In this situation git pull vs git rebase
↧