Talk:Upgrade Mastodon

23-10-01 - Discussion re: initial forking models

Diagrams

Jonny v1 diagram

• 
• 

gitGraph
    commit
    branch glitch-soc-main order: 5
    branch merge-upstream order: 4
    branch nms-main order: 0
    commit
    commit
    branch dev order: 1
    commit id: "Work happens"
    branch feature-1 order: 2
    commit
    commit
    checkout dev
    merge feature-1
    checkout nms-main
    merge dev tag: "feat-1"
    checkout dev
    merge nms-main
    checkout upstream
    commit tag: "4.2"
    checkout glitch-soc-main
    merge upstream
    checkout merge-upstream
    merge glitch-soc-main
    merge dev id: "4.2+feat-1"
    commit id: "bugfixes"
    checkout dev
    merge merge-upstream
    branch release-4.2 order: 7
    commit tag:"4.2-release"
    checkout nms-main
    merge dev tag: "4.2+feat-1"
    checkout dev
    commit
    branch feature-2 order: 3
    commit
    commit
    checkout dev
    merge feature-2
    checkout nms-main
    merge dev tag: "4.2+feat1+feat-2"
    checkout dev
    merge nms-main
    checkout upstream
    commit id: "more upstream work"
    commit tag: "4.3"
    checkout glitch-soc-main
    merge upstream
    checkout merge-upstream
    merge glitch-soc-main tag: "4.3+feat-1"
    merge dev id: "4.3+feat1-feat2"
    commit id: "bugfixes again"
    checkout dev
    merge merge-upstream
    branch release-4.3 order: 8
    commit tag: "4.3-release"
    checkout nms-main
    merge dev tag: "4.3+feat-1+feat-2"

Proposed SOP for maintaining features branches and custom release branches

Diagrams

Manisha v2 diagram

• 
• 
• 

gitGraph

    branch upstream order:6
    commit
    commit
    branch glitch-clean-sync order:5
    commit tag:"4.1"
    branch feat-1 order:1
    checkout feat-1
    commit
    commit
    checkout glitch-clean-sync
    branch feat-2 order:2
    commit
    commit
    commit
    branch dev-stable order:3
    merge feat-1
    merge feat-2
    checkout glitch-clean-sync
    branch custom-glitch4.1 order:4
    merge dev-stable
    commit tag:"4.1+feat1+feat2"
    checkout upstream
    commit
    commit
    commit
    commit
    commit
    checkout glitch-clean-sync
    merge upstream
    commit tag:"4.2"
    branch custom-glitch4.2 order:2
    checkout custom-glitch4.2
    merge dev-stable
    commit tag:"4.2+feat1+feat2"
    checkout glitch-clean-sync
    branch feat3
    commit
    commit
    checkout upstream
    commit
    commit
    checkout feat3
    commit
    commit
    checkout dev-stable
    merge feat3
    checkout upstream
    commit
    commit
    checkout glitch-clean-sync
    merge upstream
    commit tag:"4.3"
    branch custom-glitch4.3
    merge dev-stable
    commit tag:"4.3+feat1+2+3"