반응형
1. The Happy Case
1) Make a branch of version2
2) Three commits on version2
3) Merge version2 into Main
In this case, there would be no issue.
Start on master, make only a branch on master, and just merge.
2. A bit of unhappy case.
1) Make two branches of version2, version3
2) Some commits on version2
3) Other commits on version3
4) Merge version3 into Main, it will be mostly okay.
5) Merge version2 into Main. If you work the same file on version2, It's supposed to have a trouble.
- P.S. The website of learngitbranching would come in handy.
반응형
'Computer Science' 카테고리의 다른 글
[JAVA] 입출력 예제 - 백준 10951 (0) | 2021.06.15 |
---|---|
[JAVA] 입출력 예제 - 백준 10950 (0) | 2021.06.15 |
소스트리쓰는데 깃헙사이트에서 뭐 지웠다고 꼬였다 (0) | 2021.06.13 |
[SQLD 자격증] 이틀 벼락치기 성공 후기 및 공부방법 정리( 20.11.29 시험 , 비전공자, 대학 DB수업 ) (3) | 2021.01.21 |
Greedy1. 프로그래머스 체육복 (파이썬 풀이) (0) | 2020.09.23 |