On Friday, January 11, 2013 8:43:59 AM UTC+1, python...@gmail.com wrote:

> @Thomas -- I get the following message..it saying there are merge 
> conflicts ,even if there are merge conflitcs..it should sync all the files 
> and git status should show them but git status just shows 2 files while 
> there are 10 files in the patch set.
> error: could not apply d50d931... code: Wait for ack and issue delsta 
> after transmitting the
> hint: after resolving the conflicts, mark the corrected paths
> hint: with 'git add <paths>' or 'git rm <paths>'
> hint: and commit the result with 'git commit'
> Resolved 'file.h' using previous resolution.
> Resolved 'file2.h' using previous resolution.

If a cherry-pick does not cleanly apply, say if you are cherry-picking a 
commit that includes changes in files that do not exist in your branch, you 
will get conflicts.

Please share with us the following:

a) The output of git show --name-status d50d931
b) The output of "git status" - right after cherry-picking
c) The Parent(s) of the Patch-set in the Gerrit UI
d) Any Dependencies of the Patch-set in the Gerrit UI
e) The output of "git rev-parse HEAD" (your current commit)
f) The log output of "git log --pretty=format:%P --graph --all" -- this is 
an "anonymized" graphical representation of your git log - I want to find 
the Parent reference and see where it fits in here.


Reply via email to