On Thu, Feb 21, 2013 at 11:05:56AM +0100, Stefan Fuhrmann wrote:
> On Mon, Feb 18, 2013 at 5:54 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> > BTW, how are you managing your branch? I tried merging it back to
> > trunk to get an idea on the diff and there were a lot of text and tree
> > conflicts. I thought I had seen you doing synch merges from trunk in
> > the past so I assumed it would merge back.
> >
>
> Hm. I split fsfs.c and .h into multiple files on the
> branch and the first merge from /trunk required
> significant manual intervention. Since that, merges
> have been clean because fsfs.* wasn't touched
> on /trunk.
>
> If I understand Julian's merge changes in 1.8,
> reintegrating should work because there has been
> no cherry picking etc.
Julian's merge changes don't affect tree conflict handling at all.
Generally, you'll always get tree conflicts when merging between
branches which have different tree structures in parts of the
branches affected by the merge. So until trunk receives your
refactoring, there will be tree conflicts. (We're not even automatically
handling simple renames during merges yet, so I doubt we'll
automatically handle the split-file scenario anytime soon).
Received on 2013-02-21 11:13:25 CET