プルリクエストしたらconflictだった場合
conflictの状態では他のブランチに切り替えることができない
以下エラーがでる。
error: you need to resolve your current index first
$ git merge --abort
でマージ前の状態に戻せばブランチの切り替えができるようになる。
owner@ownernoMacBook-Pro springboot-dev-docker-template-master % git branch main * refactoring owner@ownernoMacBook-Pro springboot-dev-docker-template-master % git checkout main volumes/app/src/main/java/com/example/demo/controllers/RootController.java: needs merge volumes/app/src/main/java/com/example/demo/repositries/ItemRepository.java: needs merge volumes/app/src/main/java/com/example/demo/servise/ItemService.java: needs merge volumes/app/src/main/resources/templates/root/list.html: needs merge error: you need to resolve your current index first owner@ownernoMacBook-Pro springboot-dev-docker-template-master % git merge --abort owner@ownernoMacBook-Pro springboot-dev-docker-template-master % git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. owner@ownernoMacBook-Pro springboot-dev-docker-template-master % git pull origin main remote: Enumerating objects: 59, done. remote: Counting objects: 100% (59/59), done. remote: Compressing objects: 100% (19/19), done. remote: Total 21 (delta 10), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (21/21), done. From https://github.com/meo2718/crud_app_java * branch main -> FETCH_HEAD 64e9e08..43a7859 main -> origin/main 8 files changed, 174 insertions(+), 53 deletions(-)