carlosschults / logical-conflict-demo

This is a sample application to demonstrate a conflict caused by a git cherry-pick operation.