Git - how to automatically resolve "deleted by us" conflict when cherry-picking

git git-cherry-pick git-merge-conflict
Legat picture Legat · Apr 10, 2017 · Viewed 7.5k times · Source

I run the following command:

git cherry-pick SHA --strategy-option theirs

and get a conflict like this waiting for manual resolution:

deleted by us: SOME_FILE

Is there a way to make git automatically resolve such conflicts by adding files deleted by us?

Answer

Rahul R. picture Rahul R. · Dec 27, 2017

deleted by us are the new files which you added in your commit (getting cherry picked). But these files are not present in the current branch (the one in which you are cherry-picking into).

So in this case you have to add these files manually by running:

git add <file-path>

However if you think, these files will no longer be needed in the current branch after cherry picking, in that case you can do:

git rm <file-path>

Related questions

hint: after resolving the conflicts, mark the corrected paths

git sometimes gives me this message on a conflict (during a revert or cherry pick) hint: after resolving the conflicts, mark the corrected paths What does this mean?

Read More
What does cherry-picking a commit with Git mean?

Recently, I have been asked to cherry-pick a commit. So what does cherry-picking a commit in git mean? How do you do it?

Read More
How can I selectively merge or pick changes from another branch in Git?

I'm using Git on a new project that has two parallel -- but currently experimental -- development branches: master: import of existing codebase plus a few modifications that I'm generally sure of exp1: experimental branch #1 exp2: experimental branch #2 exp1 and …

Read More