2-way-merge1 Git branch & conflict(4) Git branch o2 Branch o2 생성. $git branch o2 $git log --all --graph --oneline * 698fa33 (HEAD -> master, o2) work 1 work.txt 수정 Git commit -am "master work 2" staging area에 work.txt add 및 "master work 2" 버전 생성. $git commit -am "master work 2" $git log --all --graph --oneline * 4565142 (HEAD -> master) master work 2 * 698fa33 (o2) work 1 Git checkout o2 $git checkout o2 switched to branch 'o2' $git.. 2024. 2. 18. 이전 1 다음
