Facing issue in git auto merge abort

Question

I am using below command to apply the patch using 'git am --continue ' command. It doesn't executed successfully. I tried to abort the process using below command.

git am --abort

But I am getting below error:

Resolve operation not in progress, we are not resuming.

Pls suggest how to resolve this.

git status doesn't show anything.. It shows 'nothing to commit working directory clean' — Rajeshkumar, Nov 30 '18 at 01:41
Then `git am --abort` won't work because there's nothing in progress. If there were, git would say so. — mkasberg, Nov 30 '18 at 15:45

score 3 · Accepted Answer · answered Nov 30 '18 at 05:50

it shows 'nothing to commit working directory clean

Then check your history: git log, for a new commit created duringthe git am process.

If there is none, you can try again to apply your patch.
if there is, and its content is not to your liking, you can throw it away and retry your patch.

Facing issue in git auto merge abort

1 Answers1