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

Re: jgit merge question

From
Shawn O. Pearce <spearce@spearce.org>
Date
Jan 14, 2009, 23:12 UTC
Message-ID
<20090114231222.GB10179@spearce.org>
In-Reply-To
<AB447EEF7BAAB7489B29A4F3F788D02C01CDD792@EX07.asurite.ad.asu.edu>
David Birchfield <dbirchfield@asu.edu> wrote:
Show 7 quoted lines
> 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.
Previous: David BirchfieldNext: David Birchfield
Message 5 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.