Hi Maheshwaran, On Wednesday, July 12, 2017 at 2:34:44 PM UTC+2, Maheshwaran A N wrote: > > '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. >
This is incorrect -- it`s exactly the opposite, as the other two answers already pointed out. The file is deleted by you, in your branch in which you`re trying to cherry-pick into, and the commit you`re trying to cherry-pick actually still has that file and contains some changes for it. So you get to resolve the conflict by either reintroducing the file in your branch (accepting its state from the commit you`re cherry-picking), or you get to confirm the file should really stay deleted... as already explained in previous messages. Oh, and this topic is from 2013/2014... just saying :) Regards, Buga -- 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.
