accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mike Drob <md...@mdrob.com>
Subject Merging Practices
Date Sat, 06 Jul 2013 20:36:41 GMT
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