Use libgit2 for checking for conflicts