Weave – A language aware merge algorithm based on entities
Weave is an entity-level semantic merge driver for Git that resolves conflicts by understanding code structure using tree-sitter. It achieves 31 out of 31 clean merges, compared to Git's 15 out of 31.
github.com
4 min
3/4/2026
15 years later, Microsoft morged my diagram
A diagram created in 2010 to illustrate a successful Git branching model has been found on Microsoft's Learn portal. The original diagram, designed in Apple Keynote, has spread widely since its publication, with the source file made available for others to use.
nvie.com
3 min
2/18/2026
Weave – A language aware merge algorithm based on entities
Weave is an entity-level semantic merge driver for Git that resolves conflicts by understanding code structure using tree-sitter. It achieves 31 out of 31 clean merges, compared to Git's 15 out of 31.
github.com
4 min
3/4/2026
15 years later, Microsoft morged my diagram
A diagram created in 2010 to illustrate a successful Git branching model has been found on Microsoft's Learn portal. The original diagram, designed in Apple Keynote, has spread widely since its publication, with the source file made available for others to use.
nvie.com
3 min
2/18/2026
Weave – A language aware merge algorithm based on entities
Weave is an entity-level semantic merge driver for Git that resolves conflicts by understanding code structure using tree-sitter. It achieves 31 out of 31 clean merges, compared to Git's 15 out of 31.
github.com
4 min
3/4/2026
15 years later, Microsoft morged my diagram
A diagram created in 2010 to illustrate a successful Git branching model has been found on Microsoft's Learn portal. The original diagram, designed in Apple Keynote, has spread widely since its publication, with the source file made available for others to use.
nvie.com
3 min
2/18/2026
No more articles to load