我在master分支中进行了一些更改,并希望将其引入上游。当我选择以下提交时,但是我陷入了git说的fd9f578上:
$ git cherry-pick fd9f578
fatal: Commit fd9f57850f6b94b7906e5bbe51a0d75bf638c74d is a merge but no -m option was given.
git试图告诉我什么,在这里选择正确的选择是正确的选择吗?master分支确实包含对文件的更改,这些更改已在上游分支中进行了修改,因此我敢肯定会有一些合并冲突,但是合并冲突还算可以解决。我知道哪些地方需要更改。
这些是我想带入上游的提交。
e7d4cff added some comments...
23e6d2a moved static strings...
44cc65a incorporated test ...
40b83d5 whoops delete whitspace...
24f8a50 implemented global.c...
43651c3 cleaned up ...
068b2fe cleaned up version.c ...
fd9f578 Merge branch 'master' of ssh://extgit/git/sessions_common
4172caa cleaned up comments in sessions.c ...
千万里不及你
慕慕森