/conflict

A repository with intentional conflicts to demonstrate how to merge with git

conflict

A repository with intentional conflicts to demonstrate how to merge with git