Hi, On Wed, 14 Jan 2009, David Birchfield wrote: > I have been working with the JGit library and with the pgm files and > other documentation I have been able to implement most of the basic > functions that I need for my testing application - including fetch. > This is great! However, I have not been able to successfully implement > the merge function with JGit. There is some reference to this in the > mail archive, but I cannot find any of the merge code that is referenced > in the distribution. You mean http://thread.gmane.org/gmane.comp.version-control.git/100524/focus=100589 ? Yes, it has not been implemented, basically because it needs a diff implementation, and I constantly run out of time working on it. I have something that works, but needs lots of improvements to be usable (basically, it has to avoid deep recursion depths). Ciao, Dscho -- 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
