Home▸Computer Science▸Git Branching Model: Feature Flow & Merge Conflict Risk

Git Branching Model: Feature Flow & Merge Conflict Risk

Interactive 3D git branching-model simulator: watch feature branches spawn off a growing main line, live long enough to diverge, and merge back — with merge-conflict probability driven by a real divergence formula. Compare Git Flow, GitHub Flow and Trunk-Based Development.

Computer Science3DModerate60 FPS📱 Mobile-adapted⇄ 2D version

A live 3D commit graph: feature branches spawn off a growing main line, accumulate their own commits while fanning outward, and merge back after a configurable lifetime — with the probability of a merge conflict driven by a real divergence-based formula, P(conflict) = 1 − e^(−λ·d), where d is how many main commits have landed since the branch point and λ is how densely branches contend for the same files. Switch between Git Flow, GitHub Flow and Trunk-Based Development to see how branch lifetime and direct-to-main commit rate trade off against conflict risk, and watch live readouts for active branches, completed merges, conflict rate and average lead time.

⚙ Under the hood

A live 3D commit-graph simulator: feature branches spawn off a growing main line, accumulate their own commits, and merge back with a conflict probability driven by a real divergence formula. Compare Git Flow, GitHub Flow and Trunk-Based Development.

gitbranchingmerge-conflictdevopssoftware-engineeringworkflow

3D · Three.js / WebGL renderer · 60 FPS target · runs fully client-side, no install