New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

master branch git conflict 해결 #44

Open

leeyunjea opened this issue Aug 27, 2019 · 0 comments

Member

leeyunjea commented Aug 27, 2019

file init branch를 master로 잘못 올린 것을 해결.

origin의 master에 올린 것이 아니라 그냥 master 브랜치가 만들어져서 충돌이 난 것이라고 예상.
master 브랜치를 다시 만들고 예전거를 모두 삭제하고 새로 만든 master 브랜치를 defualt로 설정.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment