error Failed to merge in the changes hint Use git am --show-current-patch to see the failed patch Patch failed at 0001 b1

Question

Hi Guys,

I am trying to rebase between two branch in Git. But it shows me the below error.

$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: b1
Using index info to reconstruct a base tree...
M       a.txt
Falling back to patching base and 3-way merge...
Auto-merging a.txt
CONFLICT (content): Merge conflict in a.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 b1
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

How can I solve this error?

Answer 1

Hi@akhtar,

You got this error because you have conflict issue between your branches. So edit your file manually and remove the conflict. You can also use p4merge tool to solve conflict issue.

Hope this will help you.