728x90
Check current branch
35mwl@remoted MINGW64 ~/OtpServer (master)
$ git branch
* master
# current branch was checked with * mark
check out current branch to child branch
$ git checkout "child_branch"
After checking out, merge master into child_branch to use IntelliJ or command like "git merge master"
"git merge master" means to merge "master" into "child_branch" or others.
With conflicted between master and child, merge will be failed. In this case, recommend to use IDE tools for Debug
Quote
https://heestory217.tistory.com/38
Merge branch 'master' into 개별브랜치
마스터 브랜치의 내용을 개별 브랜치로 Merge하는 방법 내 브랜치에 마스터 브랜치 내용을 업데이트 해봅시다 👩💻 1. 터미널 열기 .git 폴더가 있는 디렉토리에서 git bash 열기 디렉토리 확인, g
heestory217.tistory.com
'Env Setting > Git' 카테고리의 다른 글
| [IntelliJ] How to merge (0) | 2024.03.20 |
|---|---|
| How to find the hash of branch in Git? (1) | 2024.03.18 |
| When to Git Clone SSL certificate issue (0) | 2024.03.15 |
| [RESET] git reset 조지기 (32) | 2023.12.12 |
| GIT BASH에서 FATAL: PROTOCOL 'HTTPS' IS NOT SUPPORTED 에러가 날 때 (62) | 2023.03.23 |