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 11, 2020 in Git & GitHub by akhtar
• 38,210 points
2,596 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 11, 2020 by MD
• 95,300 points

Related Questions In Git & GitHub

0 votes
1 answer

How to reset the changes in Git?

Hi@MD, Reset command can be used to undo ...READ MORE

answered Nov 20, 2020 in Git & GitHub by akhtar
• 38,210 points
165 views
+1 vote
1 answer

How to abort the merge conflict in Git?

Hi@akhtar, You can use the git reset --merge ...READ MORE

answered Dec 23, 2020 in Git & GitHub by MD
• 95,300 points
1,551 views
0 votes
1 answer
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,890 points
1,077 views
+15 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 27, 2018 in DevOps & Agile by DragonLord999
• 8,450 points
1,290 views
+2 votes
1 answer
0 votes
1 answer

How to stash untracked files of the current working directory in Git?

Hi@akhtar, In order to stash untracked files, add ...READ MORE

answered Nov 20, 2020 in Git & GitHub by MD
• 95,300 points
1,363 views
0 votes
1 answer

How to get the current branch name in Git?

Hi@akhtar, You can run the git branch command ...READ MORE

answered Dec 22, 2020 in Git & GitHub by MD
• 95,300 points
2,150 views