今天我注意到git要求我在我的主分支上合并。这是可疑的，因为我从不在主分支上提交。所以我看了两个历史：
本地
* 595ad41 (HEAD -> master) Merge pull request #201 from project/feature/awesome
|\
| * f9e3bb4 (origin/feature/awesome) Title
| * b78866e Title
* | 6b93955 Title
[...]
REMOTE
* f14ade3 (HEAD, origin/staging, origin/master, origin/HEAD) Merge pull request #205 from proect/fix/awesomeness
|\
| * 67ae410 (origin/fix/awesomeness, fix/awesomeness) Fix awesomness
|/
* 91384e6 [staging] Title
* ca04409 [staging] Title
* 73fe5ff Merge pull request #204 from project/fix/something
|\
| * b31a9da (origin/fix/something, fix/something) fix newline
|/
* 595ad41 (master) Merge pull request #201 from project/feature/awesome
|\
| * f9e3bb4 (origin/feature/awesome) Title
| * b78866e Title
* | 6b93955 Title
[...]
所以我认为在git pull之后我的本地版本将与我的远程版本相同。但是git问我合并消息并生成以下内容：
* 83463ef (HEAD -> master) Merge branch 'master' of github.com:org/project
|\
| * f14ade3 (origin/staging, origin/master, origin/HEAD) Merge pull request #205 from project/fix/awesomness
| |\
| | * 67ae410 (origin/fix/awesomness, fix/awesomness) Fix awesomness
| |/
| * 91384e6 Title
| * ca04409 Title
| * 73fe5ff Merge pull request #204 from project/fix/something
| |\
|/ /
| * b31a9da (origin/fix/something, fix/something) fix newline
|/
* 595ad41 Merge pull request #201 from project/feature/awesome
|\
| * f9e3bb4 (origin/feature/awesome) Title
| * b78866e Title
* | 6b93955 Title
[ ... ]
有关为何以及如何解决这个问题的想法？
谢谢！