git-git: Add conflicts and provides