How do I apply rejected hunks after fixing them?

git conflict patch git-apply
eckes picture eckes · Jul 26, 2013 · Viewed 27.2k times · Source

I'm trying to apply a patch to a file using git apply. The overall patch failed, so I used git apply --reject.

Inspecting the generated .rej file showed me what's wrong, now I fixed the problem in the .rej file.

But trying to apply the .rej file fails with message

fatal: patch fragment without header at line 2: ...

Is there a way to re-apply the .rej file after fixing the problems there? Or do I have to modify the original patch and have to re-run git apply?

This would be a bit cumbersome in that case since the original patch contains patches for dozens of files and I don't want to git checkout the applied modifications in order to re-git apply the whole fixed patch file.

Answer

drzaus picture drzaus · Feb 17, 2015

To clarify what @julian-squires said, the problem is that the .rej files are missing some minor stuff between diff a/thefile... and @@ -line/columns....

ORIGINAL .rej file

diff a/the/original/file.cs b/the/original/file.cs    (rejected hunks)
@@ -27,9 +27,9 @@ whatever was on that line

You need to copy the a/b filenames from the diff line and add them with the change indicators below, like:

UPDATED .rej file

diff a/the/original/file.cs b/the/original/file.cs    (rejected hunks)
--- a/the/original/file.cs
+++ b/the/original/file.cs
@@ -27,9 +27,9 @@ whatever was on that line

Then you can apply the .rej files like a regular patch.

Related questions

Git resolve conflict using --ours/--theirs for all files

Is there a way to resolve conflict for all files using checkout --ours and --theirs? I know that you can do it for individual files but couldn't find a way to do it for all.

Read More
Eclipse EGit Checkout conflict with files: - EGit doesn't want to continue

I've started Eclipse EGit. In some scenarios it is really not comprehensive. I have local file e.g. pom.xml changed. On git server this file was changed. I do pull, EGIt says: Checkout conflict with files: i.e. pulling …

Read More
How do I manage conflicts with git submodules?

I have a git superproject that references several submodules and I am trying to lock down a workflow for the rest of the my project members to work within. For this question, lets say my superproject is called supery and …

Read More