what's mean of the issue

This implies that you are were in the middle of a rebase when attempting to apply the patch. To resolve that you should try ...

# git rebase --continue

Or

# git rebase --abort

Cheers
Jon

Hi,

That means that your current commit is not the same that the parent of the patch you are trying to apply, probably you made some changes. To fix that you have to rebase the patch or move to the parent commit.

Israel Cepeda said:

That means that your current commit is not the same that the parent of the patch you are trying to apply, probably you made some changes. To fix that you have to rebase the patch or move to the parent commit.

Git should still attempt to apply the patch even if that was the cause. If it is unable to apply the patch it would tell you it was unable to do so. This error looks different to me.

Jon

When using "git am" it also check for the commit id and you can get that kind of errors, if instead you use "git apply" it will just apply the patch without any verification to the repo, just the differences.

It might apply the patch anyway but you will get that warning each time you apply a patch using "git am"

Israel Cepeda said:

When using "git am" it also check for the commit id and you can get that kind of errors, if instead you use "git apply" it will just apply the patch without any verification to the repo, just the differences.

I use git am all the time to apply patches I have saved from mailing lists to mbox files. As I mentioned it is fails to apply the patch it will tell you. You will not get the error that was mentioned above.

Jon

Israel Cepeda said:

When using "git am" it also check for the commit id and you can get that kind of errors, if instead you use "git apply" it will just apply the patch without any verification to the repo, just the differences.

It might apply the patch anyway but you will get that warning each time you apply a patch using "git am"

You should note that if the patch will not apply due to changes made in the code then it will not apply with either "git am" or "git apply". From that stand point there is no difference.

Now if you were doing some rebasing or had applied some other patch with "git am" that failed, git would not allow you to apply another patch with "git am" until you completed what you were doing (which is what you want). However, you could apply changes with "git apply" because it does not check if you are in the midst of a rebase, etc. However, I would not recommend that as "git apply" does not commit the change and hence keep the authorship, changelog, etc.

The wiki says to use git am and that is the correct way to apply these patches. Git apply should not be used in this case as that is not a good way to maintain patches.

Jon

Hi, Jon

i have tyied both of  your idea, but got this issue below

It looks like git-am is in progress. Cannot rebase.

could u help me?

BR

Younger