TIL/Git

Git | branch conflict 해결하기

by 홍차23 2020. 11. 23.

git 브랜치 간 꼬였을 때

readme 수정, (충돌있는 파일)

git add .

git commit -m "Merge"

git push origin main

git checkout deploy
git pull origin main

Git \| error: failed to push some refs to (0)	2020.12.11
Git \| revert (0)	2020.10.15
Git \| fatal: No such remote (0)	2020.10.15
Git \| fatal: remote origin already exists (0)	2020.10.15

SKYING23