Hi Florian,
On Friday 07 January 2005 17:50, Florian Specker wrote:
> hi all,
>
> first of all, i'd like to thank you for this great app! i use it at work
> to resolve conflicts when working with subversion, and k3diff helps a
> lot. keep up the good work!
Thanks.
> occasionally, i have conflicting changes where i'd like to keep both.
> e.g. i've added a new statement in line 14, and someone else added a
> different new statement at line 14 at the same time. when merging, i'd
> like to keep both lines. in the context menu of a <Merge Conflict>, i
> can only choose "Select Line(s) from A" or "Select Line(s) from B", but
> i'd like to "Keep Line(s) from A before B" or "Keep Line(s) from B
> before A".
This should already work by selecting all wanted sources in the order you want
them. e.g. If you want the lines from B first, press B first and then A.
Toggling these buttons again will remove the respective lines.
> additionally, if the conflicting add operations span over several lines,
> this choice should be possible on a per-line basis (instead of a
> per-conflict basis).
>
> afaik, tortoise merge offers such functionality; it would be nice to
> have it available in kdiff3 as well :-)
Yes, it's on my todo-list, but for now you can help yourself by editing the
result. e.g. Select A and B and then use cut and paste to move the lines to
the correct places.
Cheers,
Joachim
|
