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

[20210419] AWS설정, Git #102

Open

JuHyun419 opened this issue Apr 19, 2021 · 0 comments

Labels

Infra

Owner

JuHyun419 commented Apr 19, 2021

AWS EC2 인스턴스 생성 및 설정

https://zzang9ha.tistory.com/329

Git 충돌, 삽질

Git pull 받은 내역 롤백(복구)

https://zzang9ha.tistory.com/330

git reflog // 모든 커밋의 기록 확인
git reset --hard HEAD@{1} // HEAD@{1} 으로 롤백

Git main브랜치에 다른 브랜치 덮어쓰기

branch 충돌로 인해 main 브랜치 관리가 ... 😥
특정 branch로 덮어쓰기

1. 덮어 쓸 branch로 이동(checkout)
2. git merge --strategy=ours main
3. git checkout main
4. git merge --no-ff <덮어쓸 branch명>

https://mparchive.tistory.com/173

JuHyun419 added the Infra label

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