Deleted by us doesn't actually mean the file is deleted. It is actually the opposite. You did not have that file, but the cherry-pick contained changes to the file, so it will add the full file but will not "git add $thefile", hence `deleted by us`... meaning deleted from the merge so that you can verify it first... to add whole file.
On Monday, March 25, 2013 7:38:55 PM UTC-4, 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.
