git-flow

Git merge hotfix branch into feature branch

by

Let’s say we have the following situation in Git: A created repository: mkdir GitTest2 cd GitTest2 git init Some modifications in the master take place and get committed: echo “On Master” > file git commit -a -m “Initial commit” Feature1 branched off master and some work is done: git branch feature1 git checkout feature1 echo … Read more

Create a branch in Git from another branch

by

I have two branches: master and dev I want to create a “feature branch” from the dev branch. Currently on the branch dev, I do: $ git checkout -b myfeature dev … (some work) $ git commit -am “blablabla” $ git push origin myfeature But, after visualizing my branches, I got: –**master** ——0—–0—–0—–0—–0 ————————**dev**—-**myfeature** I … Read more