'deleted by us' means the file is deleted in the commit which you are trying to do a cherry-pick. It is not file is deleted by you. Git tells that the file was deleted in some other commit, and allows you to decide to retain it (git add) or to remove it. You can do git cherry-pick --continue once you sort this out.
On Tuesday, 26 March 2013 05:08:55 UTC+5:30, 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 > -- 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/d/optout.
