git/list[1] front-page[2] threads[3] people[4] search[5] about
 

jgit merge question

From
DBDavid Birchfield <dbirchfield@asu.edu>
Date
Jan 14, 2009, 07:55 UTC
Message-ID
<4EDE3D74-CEA3-473C-ADD1-03B79AAB9EDF@asu.edu>
In-Reply-To
<S1760244AbZANHqN/20090114074613Z+1959@vger.kernel.org>
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

Next: Johannes Schindelin
Message 1 of 7 in “jgit merge question”
  1. David BirchfieldJan 14, 2009
  2. Johannes SchindelinJan 14, 2009
  3. Shawn O. PearceJan 14, 2009
  4. David BirchfieldJan 14, 2009
  5. Shawn O. PearceJan 14, 2009
  6. David BirchfieldJan 15, 2009
  7. Shawn O. PearceJan 15, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.