jackrabbit-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alexander Klimetschek <aklim...@day.com>
Subject Re: [jr3] Repository microkernel
Date Fri, 19 Feb 2010 15:25:01 GMT
On Fri, Feb 19, 2010 at 16:03, Marcel Reutegger
<marcel.reutegger@gmx.net> wrote:
> I think there is no way around some change merging. I would try to
> design something that works along the lines of a SCM system. before
> you commit, do an update and merge external changes into your
> modification, then commit. I think for most of the conflict scenarios
> there are sensible resolutions that will work well in practice.

Maybe we should look if we can learn something from git, which is
fast. The article Thomas pointed at was already interesting.


Alexander Klimetschek

View raw message