错误信息“error: commit is a merge but no -m option was given”意味着你尝试对一个合并提交进行操作(如git revert、git cherry-pick等),但没有使用-m选项来指定哪个父提交应该被视为“主线”(mainline)。由于合并提交有两个或多个父提交,Git需要知道在撤销或选择提交时应该保留哪个父提交的信息。 2. 问题...
error: commit cae5381823aad7c285d017e5cf7e8bc4b7b12240 is a merge but no -m option was given. 我们来看看 -m 到底指的是什么, 援引 官方文档, 可以看到: Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline. This option spec...
http://stackoverflow.com/questions/9229301/git-cherry-pick-says-38c74d-is-a-merge-but-no-m-option-was-given 如果操作的commit是一次合并记录的话,此次的commit是有2个父节点的,需要用户指明,cherry-pick哪一个父节点。这样做,会丢失掉这次合并的记录。 我的处理方法是,直接忽略这次的commit,不进行cherryp...
$ git revert HEAD~1fatal: Commit 137ea95 is a merge but no-m option was given. 对于revert merge的情况,程序员需要指出revert 这个merge commit中的哪一个。通过--mainline参数,以及配合一个 整数参数,git就知道到底要revert哪一个merge。我们先来看一下要revert的这个merge commit: $ git log HEAD~1 ...
error: commit 8d7567 is a merge but no -m option was given. 这个错误表示,你试图使用git cherry-pick命令应用一个合并提交(merge commit),但没有使用-m选项指定提交信息(commit message)。 当你尝试cherry-pick一个合并提交时,Git需要你提供一个新的提交信息,因为合并提交通常具有如"Merge branch 'xxx' in...
我们通过git revert xxx命令回滚某次merge过的commit,此时会报错commit is a merge but no -m option was given.,这是因为当前的merge commit其实包含了两个子commit,也就是当时合并的两个commit,因此在执行git revert的时候会失败,需要选择回滚具体的两个子commit中的一个才可以正常回滚。
$ git commit -a -m 'made a change' 1. 2. image.png Figure 15. The HEAD branch moves forward when a commit is made This is interesting, because now your testing branch has moved forward, but your master branch still points to the commit you were...
To change the update strategy, deselect this option to invoke the Push Rejected dialog the next time push of the current branch is rejected, apply a different update procedure, and select the Remember the update method choice option once again. Select the update method (rebase or merge) by cl...
When you make a change to a file in the editor, click the corresponding change marker in the gutter. note If there are no change markers in the gutter, make sure the Highlight modified lines in the gutter option is enabled on the Version Control | Confirmation | Gutter settings page Ctrl...
This would be a great option! 🤞 Is it easy to add a--no-commitoption to the GitLens settings? By default I never want to automatically commit after a non-conflicting merge. dimaulupov added a commit that references this issueon Sep 1, 2021 ...