minte9
LearnRemember / GIT



Branch

Create a branch named hotfix. 
 
git checkout master
git checkout -b hotfix    # Look here

touch bugfix.htm
git add bugfix.htm
git add .

git commit -m "Added from hotfix"

Merge

Merge and then delete hotfix branch. 
 
git checkout master

git merge hotfix    # Look here
git branch -d hotfix

# Then you can continue in dev

git checkout dev
git merge master






Questions and answers




Merge master with modifications from hotfix

  • a) git merge hotfix
  • b) git merge master hotfix


References