jgit merge question
From: David Birchfield <hidden>
Date: 2016-06-15 22:45:56
Hi all, My apologies in advance for the newbie question, and I hope this is the correct forum - please let me know if there is a better place. 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. I have tried to pull from pgm.MergeBase.java, but that hasn't been successful. My question: Is there any sort of tutorial or reference code snippet that implements merge? Or is there a trick to getting the MergeBase code to achieve a basic merge? Thanks in advance! Best, David