SHELL

* (no branch, rebasing )

git rebase <branch>  # usually master or origin/master
# git stops on conflict
# conflict is resolved
git add <resolved_file>
git commit  # <----- this right here is what is causing it
git rebase --continue