Gitflow

• Author:: Atlassian
• Category:: article
• URL:: Gitflow Workflow | Atlassian Git Tutorial
• Rating:: 5

Learn by elaboration

• The way Gitflow works is very flexible and allows for a rather flexible way of working
• There is a more modern flow that is becoming the better practice for modern software and CD
• I used this flow for the majority of the work that have been done in Britehouse Automotive as they did not have a fully matured DevOps pipeline implemented.
• Base way of work:
  • 

      gitGraph
        commit tag: "v0.1"
        branch hotfix
        checkout hotfix
        commit
        branch develop
        checkout develop
        commit id:"ash" tag:"abc"
        branch featureB
        checkout featureB
        commit type:HIGHLIGHT
        checkout main
        checkout hotfix
        commit
        checkout develop
        commit
        checkout featureB
        commit
        checkout main
        merge hotfix tag: "v0.2"
        checkout featureB
        commit
        checkout develop
        branch featureA
        commit
        checkout develop
        merge hotfix
        checkout featureA
        commit
        checkout featureB
        commit
        checkout develop
        merge featureA
        branch release
        checkout release
        commit
        checkout main
        merge release tag: "v1.0"
        checkout develop
        merge release

	

---

📇Additional Metadata

• 📁Type::resource
• 📎Source::article
• 🏷️ Tags:: Git, Source Code Management, DevOps
• 📡 Status::🌲