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

0 votes

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?

May 10 in Git & GitHub by akhtar
• 14,030 points
141 views

1 answer to this question.

0 votes

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.

answered May 10 by MD
• 31,430 points

Related Questions In Git & GitHub

0 votes
1 answer

How to do a re-merge into another branch in git

Seems like you want to rebase your ...READ MORE

answered May 7, 2018 in Git & GitHub by DareDev
• 6,850 points
467 views
0 votes
1 answer

How to solve the ‘Git commit -a error’?

This happens when no editor is set. ...READ MORE

answered Jul 5, 2018 in Git & GitHub by Tyrion anex
• 8,380 points
220 views
+13 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 26, 2018 in DevOps & Agile by DragonLord999
• 8,420 points
533 views
0 votes
1 answer
+1 vote
2 answers
+1 vote
1 answer