git pull を行ったと所、警告メッセージが表示された。
→ git pull origin develop
From github.com:******/*****
* branch develop -> FETCH_HEAD
fatal: It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr ".git/rebase-merge"
and run me again. I am stopping in case you still have something
valuable there.
不明
以下コマンドを実行。
rm -fr ".git/rebase-merge"
フォルダを削除すると警告はなくなった。
→ git pull origin develop
From github.com:******/*****
* branch develop -> FETCH_HEAD
Successfully rebased and updated refs/heads/develop.