Cat404's exercise on git flow-style branching
-
Start with the Production branch (main branch), and then create a HotFix and Integration branch.
-
Subsequently, create Feature 1 and 2 branches that integrate to the Integration branch as shown in the below figure.
-
Commit some changes in the Feature 2 branch and merge it into the Integration branch. Delete this branch once merging is complete.
-
Commit some changes in the Feature 1 branch and rebase it to the Integration branch.
-
Merge the Integration branch into Hotfix and Production branch to update these branches.
-
Commit some changes in Feature 1 branch, and then merge it into Integration, Hotfix, and Production branch. Delete this branch once merging is complete.
-
Commit some changes in the Hotfix branch and merge it into the Production as well as the Integration branch.