Git rebase fails to continue

 

>PROBLEM

You perform "git rebase":
git pull --rebase

And returns:

First, rewinding head to replay your work on top of it...

Applying: room1 branch by room1

.git/rebase-apply/patch:23: new blank line at EOF.

+

warning: 1 line adds whitespace errors.

Using index info to reconstruct a base tree...

M       about.diff

Falling back to patching base and 3-way merge...

Auto-merging about.diff

CONFLICT (content): Merge conflict in about.diff

error: Failed to merge in the changes.

hint: Use 'git am --show-current-patch' to see the failed patch

Patch failed at 0001 room1 branch by room1

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".

Next, you solve the conflict.
Details here

After, you try to continue the rebase, but the git refuses still requiring merging.

>SOLUTION

If the conflict was already solved, you may use skip option, as shown in the message above returned by git:

git rebase --skip

If you've performed this operation over master branch, may have consequences as information loss.

Check details here.

>ENV

Windows 10