>b) But when you have resolved conflicts when merging trunk into
>feature-branch, then you have to do that conflict resolution again
>when merging feature-trunk back to trunk
>(except for the special case you mentioned "accepting MINE").
>Is this correct?
Yes. We can not do anything intelligent here as conflict resolution could be any arbitary change.
Now I tend to think we can make conflict resolution to be unidirectional for 'accepting THEIRS' too on a line basis, but would require some amount of thought and coding.
>> Yes. But not always, In one special case conflict is not bi-directional.
>> That special case 'Resolving conflict by accepting MINE changes'.
>> In other words this algorithm reduces the conflict not eliminate it
>> fully which is impossible.
>It is possible. By doing suitable patch arithmetics.
>(For example by the algorithm which I posted some time ago.)
>But of course, this does not mean that it must be supported
>in the next subversion release.
Can you post a link to your algorithm?
Received on 2008-01-12 07:29:41 CET