Skip to content

feat: resolve a conflicted file conflict by conflict, with both sides next to each other and the result below - #21

Merged
Lars- merged 1 commit into
mainfrom
feat/three-way-conflicts
Nov 5, 2026
Merged

feat: resolve a conflicted file conflict by conflict, with both sides next to each other and the result below#21
Lars- merged 1 commit into
mainfrom
feat/three-way-conflicts

Commits

  1. Commits on Nov 5, 2026