Re: [Kdiff3-user] How to merge XML blocks (elements hierarchy)

[Joachim E. <joa...@gm...>]

Hi Inna,

I see: For lines 1 and 4 you can choose, but lines 2,3 and 5 are there only 
once.

There are two possibilities:

The easy and quite straightforward solution is to choose one side e.g. by 
pressing the "A" button for lines 1 and 4. Then select the text from B and 
copy it into the merge output, like in any other text editor.

The second possibility is to use "Join selected diffs" and "Split Diff at 
selection" from the merge menu. ("Selection" again means text selection like 
for copy and paste via the mouse.) But this should be done before doing any 
other merge choices. So you would first join your the five lines from your 
"notes" and if necessary split them from the rest, so that you can then in the 
merge choose A and B to get both.

Best regards,
Joachim


Am Donnerstag, 16. Februar 2012, 13:54:02 schrieb Ginzburg, Inna:
> How to merge XML  blocks (elements hierarchy) ?
> For example: I have 2  elements  in my merge window that came side by
> side as an conflict window A and window B. I want both of  those
> elements in my result one after another. I can't figured out how to do
> it.
> Please advice
> 
> <note to me =1234 >
>    <keyInfo name="NewDate" value="W" />
>     <keyInfo name="RenewDate" value="W" />
>    <keyInfo name="company" value="066" />
> </note>
> 
>     <note to me =123456 >
>    <keyInfo name="NewDate" value="W" />
>     <keyInfo name="RenewDate" value="W" />
>    <keyInfo name="company" value="068" />
> </note>
> 
> 
> 
> 
> Inna