Git - Cherry picking with ours/theirs strategy

git commit git-merge merge-conflict-resolution cherry-pick
Sazzad Hissain Khan picture Sazzad Hissain Khan · Aug 10, 2017 · Viewed 9.2k times · Source

I wonder if there is any way of cherry picking with ours/theirs strategy. On other words, I want to cherry pick multiple commits from dev branch into main branch with below commands,

git cherry-pick HASH1 HASH2 HASH3 -n

This command is supposed to take all referred commits and prepare unstaged changes if no conflicts. However, if conflicts, I need to resolve and continue cherry-picking. For all conflicts, my intention is to pick whatever in the dev (which means, --strategy-option = ours).

Is there any way to provide such option while cherry-picking.

Answer

VonC picture VonC · Aug 10, 2017

The git cherry-pick command does have the --strategy and --strategy-option=<option> options.

They are passed through to the merge strategies.

So, in your case:

git cherry-pick --strategy-option=ours HASH1 HASH2 HASH3 -n

Related questions

Message 'src refspec master does not match any' when pushing commits in Git

I clone my repository with: git clone ssh://xxxxx/xx.git But after I change some files and add and commit them, I want to push them to the server: git add xxx.php git commit -m "TEST" git push …

Read More
How to revert multiple git commits?

I have a git repository that looks like this: A <- B <- C <- D <- HEAD I want the head of the branch to point to A, i.e. I want B, C, D, …

Read More
Changing git commit message after push (given that no one pulled from remote)

I have made a git commit and subsequent push. I would like to change the commit message. If I understand correctly, this is not advisable because someone might have pulled from the remote repository before I make such changes. What …

Read More