I think the thing to do here is add a conflict iterator to libgit2.  #sadtrombone