prevent "(no branch, rebasing <branch>)" in the git commit message caused by prepare-commit-msg
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