Exception during 3-way merge (when pasting big text)

[immitev]

Hi,

When doing a merge with conflicts, I tried to just replace the result file, by doing Ctrl+A, Ctrl+C on the left file and then Ctrl+A, Ctrl+V on the result file below.

Couple of time doing this and got the following exception (+ white screen with two crossed red lines):

************** Exception Text **************

System.ArgumentOutOfRangeException: Index was out of range. Must be non-negative and less than the size of the collection.

Parameter name: index

at System.Collections.ArrayList.get_Item(Int32 index)

at hz.a()

at ku.b(Graphics A_0)

at ku.b(PaintEventArgs A_0)

at System.Windows.Forms.Control.PaintWithErrorHandling(PaintEventArgs e, Int16 layer, Boolean disposeEventArgs)

at System.Windows.Forms.Control.WmPaint(Message& m)

at System.Windows.Forms.Control.WndProc(Message& m)

at System.Windows.Forms.Control.ControlNativeWindow.WndProc(Message& m)

at System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)

Using "4.1.10.354 - Havana"

[manu]

Hi immitev!

can you share with us how many code lines are you trying to copy?

[immitev]

The first file was 23K, the second was a huge one 184K

Not sure it's related with file size though, both time happened when replacing the complete file contents.

[manu]

Wow. That's a lot of lines.

I'll try to test it.

[immitev]

I am running into this issue a lot (3 times today) since there are times when I just want to resolve the file conflicts with everything from a single contributor (usually the source).

And when I try to select_all+copy from one of the panes and then select_all+paste in the result pane, I relatively often got this exception. And there is nothing much to do after it happens, except to not save the result and resovle it later.

I think this can be reproduced relatively easily by trying to paste a big content that it's completely different.

I couldn't find in this screen a simple button that would just resolve the conflicts using one of the the three version (source, base, destination). Am I missing something?

[manu]

Hi immitev,

actually you can, if you realize that you want to preserve one contributor you can do 2 things:

1) Once you are in the merge window where the base, source, destination and result files are shown you can disable the contributors you don't want to include in the result. If you have a lot of conflicts and you don't want to go one by one jump to idea number 2.

2) Cancel the merge without saving the result file. You will be able to see that the file is not merge yet and it's still in the list of pending merge files. Right click into the file and then "Change merge contributor", here you can specify a contributor to be chosen. In this way, the merge will be automatic instead of manual.

[immitev]

Actually I got to know about both those options.

But in times when 1 is not a good option (due to numerous conflicts), users might prefer instead of postponing the merge (i.e. after processing all other pending merges), to do it right on the spot. It seems like a simple usability improvement.

[manu]

Yep, the first one is uncomfortable.

I always use the second one if I'm sure that I want the changes coming from the source. If you feel we can improve the workflow feel free to use the User voice system to add the idea so others can vote it. -> https://plasticscm.uservoice.com/forums/15467-general

[immitev]

It's now reported - http://plasticscm.uservoice.com/forums/15467-general/suggestions/3441295-when-merging-have-a-single-clicke-way-to-resolve-a

[manu]

Thank you very much!

You have 3 more votes from my side!