accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Josh Elser <josh.el...@gmail.com>
Subject Re: Merging Practices
Date Sat, 06 Jul 2013 22:05:59 GMT
I believe all you need to do by hand is to merge src/${module} in 1.4 to
${module} in 1.5. You just can't merge 1.4 directly in 1.5.

1.5 to trunk should be straightforward.
On Jul 6, 2013 4:37 PM, "Mike Drob" <mdrob@mdrob.com> wrote:

> I tested and committed the patch for ACCUMULO-895 and am currently trying
> to update the svn mergeinfo into 1.5 and trunk. The bottom note tells me
> that I should ask the dev list for details and help merging, so here I am
> asking. I currently have conflicts for src/server and src/core and no idea
> how to resolve them.
>
> Mike
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message