A temporary project to test aspects of Git's conflict management