분기 작업

1. 브랜치 만들기

rm -rf .git/
git init
echo "# create(master)" > file_1.md
git add .
git commit -m "create@master"
echo "# update(master)" >> file_1.md
git commit -a -m "update@master"
git branch issue-1
git branch

2. 브랜치 전환

git checkout issue-1
git branch

3. 브랜치 삭제

git branch -d issue-1
git branch

4. 분기 결합

4-1. fast-forward

rm -rf .git/
git init
echo "# create(master)" > file_1.md
git add .
git commit -m "create@master"
echo "# update(master)" >> file_1.md
git commit -a -m "update@master"
git branch issue-1
git branch
git checkout issue-1

echo "# update(issue-1)" >> file_1.md
git commit -a -m "update@issue-1"
cat file_1.md
git checkout master
cat file_1.md
git merge issue-1
cat file_1.md
git branch -d issue-1
git log --graph

4-2. non-fast-forward

rm -rf .git/
git init
echo "# create(master)" > file_1.md
git add .
git commit -m "create@master"
echo "# update(master)" >> file_1.md
git commit -a -m "update@master"
git branch issue-1
git branch issue-2
git branch
git checkout issue-1

echo "# update(issue-1)" >> file_1.md
git commit -a -m "update@issue-1"
cat file_1.md
git checkout master
cat file_1.md
git merge issue-1
cat file_1.md
git branch -d issue-1

git checkout issue-2
echo "# update(issue-2)" >> file_1.md
git commit -a -m "update@issue-2"
cat file_1.md
git checkout master
git merge issue-2
cat file_1.md

vi file_1.md
git commit -a -m "manual merge"
git branch -d issue-2
git log --graph