Moved merge conflict checking to overcommit

This commit is contained in:
Brenda Wallace
2017-03-02 19:54:18 +13:00
parent e848e18574
commit 5ec70d1438
3 changed files with 2 additions and 19 deletions

View File

@@ -64,6 +64,8 @@ PreCommit:
enabled: true
RailsSchemaUpToDate:
enabled: true
MergeConflicts:
enabled: true
PostCommit:
GitGuilt: