728x90
Git merge
- 커밋 순서를 바꾸지않는다(Non desdtructive operation: does not change commit order)
- 존재하는 브랜치가 변경되지 않는다 (Existing branches are not changed in any way)
- 새로운 merge commit을 생성한다. (Creates a new merge commit in the feature branch)
1. merge 전
2. merge 후
Git rebase
- 전체 브랜치를 마스터 브랜치 끝에 잇는다.( moves the entire branch to begin on the tip of the master branch)
Git Merge | Atlassian Git Tutorial
Git Merge | Atlassian Git Tutorial
Git branching intro. Create, list, rename, delete branches with git branch. git checkout: select which line of development you want and navigate branches
www.atlassian.com
git rebase | Atlassian Git Tutorial
git rebase | Atlassian Git Tutorial
Rebase is one of two Git utilities that specializes in integrating changes from one branch onto another.
www.atlassian.com
728x90
'개발 > 개발환경, 개발도구 - git , vscode' 카테고리의 다른 글
| '\r': command not found (visual studio code 에서 해결 포함) (0) | 2021.04.01 |
|---|---|
| visual studio code - snippet 설정하기 (0) | 2021.03.31 |
| gitlab page에 hugo 사용하기 (0) | 2020.04.10 |
| gitlab error - A default branch (e.g. master) does not yet exist for <branch_name> (0) | 2020.04.06 |
| git submodule errors (0) | 2020.03.13 |
댓글