git cherry-pick says “…38c74d is a merge but no -m option was given”

by

The way a cherry-pick works is by taking the diff a changeset represents (the difference between the working tree at that point and the working tree of its parent), and applying it to your current branch.

So, if a commit has two or more parents, it also represents two or more diffs – which one should be applied?

You’re trying to cherry pick fd9f578, which was a merge with two parents. So you need to tell the cherry-pick command which one against which the diff should be calculated, by using the -m option. For example, git cherry-pick -m 1 fd9f578 to use parent 1 as the base.

I can’t say for sure for your particular situation, but using git merge instead of git cherry-pick is generally advisable. When you cherry-pick a merge commit, it collapses all the changes made in the parent you didn’t specify to -m into that one commit. You lose all their history, and glom together all their diffs. Your call.

More Related Contents:

  1. What does cherry-picking a commit with Git mean?
  2. What is the difference between merge –squash and rebase?
  3. Git cherry pick and datamodel integrity
  4. What’s the difference between ‘git merge’ and ‘git rebase’?
  5. Rebasing a Git merge commit
  6. Git Cherry-pick vs Merge Workflow
  7. Can I make fast forwarding be off by default in git?
  8. git rebase and git push: non-fast forward, why use?
  9. How do I use `git rebase -i` after `git merge` without messing things up?
  10. What Git branching models work for you?
  11. How to merge two branches without a common ancestor?
  12. How to rebase one Git repository onto another one?
  13. Git cherry-pick syntax and merge branches
  14. How do you merge two Git repositories?
  15. How to cherry-pick a range of commits and merge them into another branch?
  16. How to merge a specific commit in Git
  17. How to cherry-pick multiple commits
  18. git rebase, keeping track of ‘local’ and ‘remote’
  19. Merging: Hg/Git vs. SVN
  20. What is the precise meaning of “ours” and “theirs” in git?
  21. `git merge -s theirs` needed but it does not exist
  22. Trying To Understand/Determine A Basic Git Workflow
  23. git pull –rebase lost commits after coworker’s git push –force
  24. Git: merging public and private branches while while keeping certain files intact in both branches
  25. Error “Updates were rejected because the remote contains work that you do not have locally”
  26. Rebasing and what does one mean by rebasing pushed commits
  27. Git: How to create patches for a merge?
  28. How do I rebase a chain of local git branches?
  29. git subtree: possible to change subtree branch/path in a forked repository?
  30. Whats the Proper usage of .gitattributes with merge=ours

Leave a Comment