[GitLab] merge locally 해결하기

• FE/develop → develop 병합 과정에서 충돌 발생
  • Resolve conflicts 버튼이 없어 GitLab GUI로 해결 불가능한 상황
  • 충돌 범위가 너무 많으면 Resolve conflicts 버튼이 비활성화 된다고 함.
  • develop 브랜치는 수정하지 않고 merge만 하는데 왜 충돌이 난지는 잘 모르겠음..

• GitLab에서 시키는대로 해보자.

git fetch origin
git checkout -b "FE/develop" "origin/FE/develop"

• 이미 존재하는 브랜치라고 할 경우 브랜치명 바꿔보기
  • 나는 로컬 레포를 삭제하고 다시 클론했더니 해결되었다.

git checkout -b "FE/develop-merge" "origin/FE/develop"

• 충돌 해결

git fetch origin
git checkout "develop"
git merge --no-ff "FE/develop"

• 위 명령어를 입력하면 어마무시한 충돌 메시지들이 뜸
  • 메시지를 잘 읽어 보면 대부분 develop에서 삭제한 파일을 FE/develop에서 수정해서 충돌이 일어났다.
  • develop 에서 파일을 삭제한 적이 없는데요… 정말 이상하지만 일단 해결해보자.

CONFLICT (rename/delete): Backend/src/test/java/com/ssafy/project/backend/BackendApplicationTests.java renamed to ApiServer/src/test/java/com/core/apiserver/ApiServerApplicationTests.java in HEAD, but deleted in FE/develop.
CONFLICT (modify/delete): ApiServer/src/test/java/com/core/apiserver/ApiServerApplicationTests.java deleted in FE/develop and modified in HEAD.  Version HEAD of ApiServer/src/test/java/com/core/apiserver/ApiServerApplicationTests.java left in tree.
CONFLICT (modify/delete): Backend/.gitignore deleted in FE/develop and modified in HEAD.  Version HEAD of Backend/.gitignore left in tree.
CONFLICT (modify/delete): Backend/build.gradle deleted in FE/develop and modified in HEAD.  Version HEAD of Backend/build.gradle left in tree.
CONFLICT (modify/delete): Backend/settings.gradle deleted in FE/develop and modified in HEAD.  Version HEAD of Backend/settings.gradle left in tree.
CONFLICT (modify/delete): Backend/src/main/resources/application.properties deleted in FE/develop and modified in HEAD.  Version HEAD of Backend/src/main/resources/application.properties left in tree.
CONFLICT (modify/delete): Frontend/asap/.eslintrc.json deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/.eslintrc.json left in tree.
CONFLICT (modify/delete): Frontend/asap/package-lock.json deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/package-lock.json left in tree.
CONFLICT (modify/delete): Frontend/asap/package.json deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/package.json left in tree.
CONFLICT (modify/delete): Frontend/asap/src/App.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/App.tsx left in tree.
CONFLICT (rename/delete): Frontend/asap/src/components/common/NavBar.tsx renamed to Frontend/asap/src/components/nav/NavBar.tsx in FE/develop, but deleted in HEAD.
CONFLICT (modify/delete): Frontend/asap/src/components/nav/NavBar.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/components/nav/NavBar.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/admin/AdminLogin.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/admin/AdminLogin.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/admin/ApiApproval.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/admin/ApiApproval.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/api/ApiApply.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/api/ApiApply.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/api/ApiDetail.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/api/ApiDetail.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/api/ApiList.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/api/ApiList.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/api/ApiSupply.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/api/ApiSupply.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/api/ApiUsage.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/api/ApiUsage.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/myapi/MyApi.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/myapi/MyApi.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/myapi/SupplierApi.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/myapi/SupplierApi.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/myapi/UserApi.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/myapi/UserApi.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/mypage/AccountInfo.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/mypage/AccountInfo.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/mypage/AccountMod.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/mypage/AccountMod.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/pages/mypage/AccountPay.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/pages/mypage/AccountPay.tsx left in tree.
CONFLICT (modify/delete): Frontend/asap/src/router/routes.tsx deleted in HEAD and modified in FE/develop.  Version FE/develop of Frontend/asap/src/router/routes.tsx left in tree.
Automatic merge failed; fix conflicts and then commit the result.

• 위에서 알려준 파일을 들어가면 차이점은 강조되고 오른쪽 하단에 merge editor로 이동할 수 있는 버튼이 활성화되어 있음.

• Merge Editor로 들어가서 충돌 해결 후 Complete Merge 누르기

• 충돌을 해결 하고 나면 해당 파일이 Staging Area로 이동한다.
• 이렇게 모든 충돌 해결 후 commit/push 하기

git commit -m "[FE] FIX : Merge Conflicts 해결"
git push origin develop

• GitLab에 다시 들어가보면 merge가 잘 되었다고 뜬다..! (신기)

References

• [GitLab] merge locally 해결하기
• VS Code - Git/GitHub 연동