On Tuesday, March 26, 2013 12:38:55 AM UTC+1, python...@gmail.com wrote:

> I am trying to cherry-pick a gerrit based on git project test.git ,for 
> some gerrits I see it tries to delete as below by creating one more "test" 
> folder inside the test directory..any idea what could be wrong here?please 
> let me know if you need more details.
> Unmerged paths:
> #   (use "git add/rm <file>..." as appropriate to mark resolution)
> #
> #       deleted by us:      test/ROE/SEME/src/cmpc/cmpc.c

When you cherry-pick, it's basically trying to apply a commit to your 
working branch.

In this case, it's not possible to cleanly apply the commit, because there 
are conflicts - there are changes in the commit you are cherry-picking, 
that conflict with recent changes in your working branch.

Git tells you which files are affected by the conflict, and hints that it 
has been "deleted by us". I figure that goes to say, that the commit being 
cherry-picked includes changes in a file which has been since deleted in 
your working branch.

If this makes sense, and the changes to the now-deleted file are 
irrelevant, then doing a "git rm test/ROE/SEME/src/cmpc/cmpc.c" is the 
right thing to do (and then commit to complete the cherry-pick). 

If you do indeed need to keep the semantics of the changes that were made 
in the deleted file, perhaps some new tests that should be moved to another 
file, then you should do this manually, then "git add" all the changed 
files before committing.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to