GitHub repository: onetom/git-conflict-example
Created: 2023-02-18T22:37:06Z
Description: Example branches to compare conflict resolution algorithms and UIs in various git clients