What does Git (master|REBASE 1/1) mean? How do I get rid of it?

You are stuck in the middle of a rebase.

If you have merged/solved conflicts for all the paths:
use git add . to commit resolved items.
use git rebase --continue to complete the process.

Or use git rebase --abort to exit the rebase process without any risk.

If git rebase --continue | --skip | --abort still do not work:

You might try to discard your local commit one by one, then use git status to make sure your local commit are up-to-date with remote branch.

git reset --hard HEAD~1

NOTE: git reset --hard will discard your work, use it only if you know what you are doing!!

Abort the rebase and take pull again

git rebase --continue 
git rebase --abort

Related