David Birchfield <dbirchfield@xxxxxxx> wrote: > Great - thanks so much for this feedback and link. My merge > needs are straightforward, so hopefully this will suit the need! > > I have pulled the latest jgit updates and downloaded the four > .java files that are referenced in your link. I have added these > to the directory structure for jgit in the following new folder: > org.spearce.jgit/src/org/spearce/jgit/merge/ Instead of copying 4 files, why don't you actually fetch the 8 commits and merge them into your local repository? You are getting build errors because you didn't get an exception type in the errors directory, and at least two existing classes had new methods added to them in order to support the merge API. -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
