git-branch

Posted on

BRANCH?

If you wanna develop new function, fix bug, ..

How..?
Just Copy repository?
How to solve merge problem, etc ..

Once upon a time…..bula bula..

이미지

OR

Use Git Branch

이미지

NEW BRANCH

git branch
git branch dev

이미지

COMMIT TO EACH BRANCH

git checkout dev
vi index.html(body tag)
git checkout master
vi index.html(head tag)

이미지

BRANCH MERGE

git checkout master
git merge dev

이미지

BRANCH REMOVE

git banch dump
git checkout dumb
git branch -d dumb

MERGE CONFLICT

git branch dev2
vi index.html(modify body tag)
git add & commit
git checkout master
vi index.html(modify body tag)
git add & commit
git merge dev2

이미지

DEFENDE CONFLICT

  • Frequently update from master branch
  • Update before commit
  • …???