Re: [RFC] An element-based 'svn merge'

On Thu, Dec 17, 2015 at 02:28:44PM +0000, Julian Foad wrote:
> On 17 December 2015 at 14:14, Stefan Sperling <stsp_at_elego.de> wrote:
> > So I think we'll need some automated support for finding moves.
> > It doesn't need to be perfect, though.
>
> Yes, that's all correct: this is only a first step, and one of the
> next steps is to provide mapping input semi-automatically, for example
> in the ways you mention.

Sounds great! I'm looking forward to helping out with integrating
this into update/merge/resolve, however we decide to proceed.
I hope we can join forces and work out an integrated solution together.

My new conflict resolver work is still not finished and I plan to continue
working on it over the course of the coming year, starting in January.
I didn't get to put a lot of time into it this year but I'll be able
to invest more time into that effort soon.
Received on 2015-12-17 15:39:40 CET