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
'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
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
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
