Managing alignment manually in Beyond Compare 3-way merge

When performing a three-way merge in Beyond Compare, we can get the following misalignment due to code similarity (X are segments of remote codes and only two files are shown):

/* XXXXXXXXXXXXXXXXX somefunc() somefunc() <---2 { { body body ... ... } } */ XXXXXXXXXXXXXXXXX somefunc() <---1 XXXXXXXXXXXXXXXXX { XXXXXXXXXXXXXXXXX modified body XXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXX } XXXXXXXXXXXXXXXXX ...next segment ...next segment 

The required alignment is as follows:

 /* XXXXXXXXXXXXXXXXX somefunc() XXXXXXXXXXXXXXXXX { XXXXXXXXXXXXXXXXX body XXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXX } XXXXXXXXXXXXXXXXX */ XXXXXXXXXXXXXXXXX somefunc() somefunc() { { modified body body ... ... } } ...next segment ...next segment 

So, I do a manual alignment between position-2 and position-1, and actually I get the following:

 /* XXXXXXXXXXXXXXXXX somefunc() XXXXXXXXXXXXXXXXX { XXXXXXXXXXXXXXXXX body XXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXX } XXXXXXXXXXXXXXXXX */ XXXXXXXXXXXXXXXXX somefunc() somefunc() XXXXXXXXXXXXXXXXX { XXXXXXXXXXXXXXXXX body XXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXX } { XXXXXXXXXXXXXXXXX modified body XXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXX } XXXXXXXXXXXXXXXXX ...next segment ...next segment 

Thus, he manages to align one line, but then he shifts the rest of the code.

How can we use manual alignment to get the desired result? Changing the settings for changing the alignment parameters also does not give the desired result. (Also note: the body and the modified body are very similar, so the match cannot be missed)

This is a forum post here that mentions a separate line-alignment, but that would be very tedious for longer sections.

Edit: If the specified alignment is not possible in the current version, is it possible to disable automatically synchronized scrolling of the input and output editor panels, so that non-primary sections of the code can be viewed by the user at the same time. These sections will be unequal in the program, but will be considered aligned from the user point of view.

+8
alignment beyondcompare three-way-merge
source share

No one has answered this question yet.

See related questions:

1653
How to align checkboxes and their shortcuts, sequentially cross browsers
781
How to align a <div> to the middle (horizontal / width) of the page
491
Best way to center a <div> on a page vertically and horizontally?
396
Responsive Image Alignment Center 3
355
How to configure Visual Studio to use Beyond Compare
104
Why is a tripartite merger better than a two-way merger?
8
When should explicit alignment directives be used in an assembly?
5
Reformatting Pycharm Code: Operator Alignment
one
unaligned opcode in an executable segment ARM assembly
0
Changing the alignment of the first line in an automatically wrapped div using CSS

All Articles