-
-
Save ponsuke0531/dadaa02ebae70377c60318d5a68d64dc to your computer and use it in GitHub Desktop.
Gitに error: commit ハッシュ is a merge but no -m option was given. と怒られて知った マージをチェリーピックする方法 ref: https://qiita.com/ponsuke0531/items/5461c5a36138119a9c6b
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git cherry-pick -m 1 {MergeのCommitのハッシュ} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
branchA----●---●---●---●-----☆--●--●-------- | |
↑Merge(hashZ) | |
branchB(削除済)--●--●---●--●--┘ | |
branchC--●-----●----●-----●----●---●---●----- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git cherry-pick {hashZ} | |
error: commit {hashZ} is a merge but no -m option was given. | |
fatal: cherry-pick failed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment