glostis / git-flow-sandbox Goto Github PK

The Git graph of this repository

%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%%
gitGraph
  commit id: "Add feature-1"
  branch develop
  branch feature-2
  commit id: "Add feature-2"
  checkout develop
  merge feature-2 id: "Add feature-2 (#1)"
  checkout master
  branch hotfix-1
  commit id: "Add hotfix-1"
  checkout master
  merge hotfix-1 id: "Add hotfix-1 (#2)"
  checkout develop
  merge master id: "Backport hotfix-1 to develop (#3)"

What steps were taken?

1. Initialize repository:

   mkdir git-flow-sandbox
   cd git-flow-sandbox
   git init
   touch feature-1
   git add feature-1
   git commit -m 'Add feature-1'
   git remote add origin [email protected]:glostis/git-flow-sandbox.git
   git push origin master

2. Create branch develop:

   git checkout -b develop
   git push origin develop

3. Merge a feature to develop:

   git checkout -b feature-2
   touch feature-2
   git add feature-2
   git commit -m 'Add feature-2'
   git push origin feature-2

   On Github, open and "squash and merge" a PR from branch feature-2 to develop: #1
4. Merge a hotfix to master:

   git checkout master
   git checkout -b hotfix-1
   touch hotfix-1
   git add hotfix-1
   git commit -m 'Add hotfix-1'
   git push origin hotfix-1

   On Github, open and "squash and merge" a PR from branch hotfix-1 to master: #2
5. Backport the hotfix to develop:
   On Github, open and "squash and merge" a PR from branch master to develop: #3
6. Notice that Github does not see that develop is not behind master anymore:
   On Github, open a PR from branch master to develop: #4. The diff still shows hotfix-1, even though it was backported to develop in the previous PR.