Support manual align in merge editor

[orgads]

Sometimes the merge editor has wrong chunk alignment, and it would be useful to allow manual alignment.

Example for added/added lines conflict:

If I'd choose "Accept combination", no matter for which side, the result would be wrong, because the right side is split to 2 chunks in the middle of the function.

What I'd like to do is to align the left side top line with the right side bottom line, and then accept both.

Beyond Compare 4 has 2 options to handle that.

1. Right-click on a line -> Align With (or left-click -> F7), then left-click on the target line in the other pane.
2. Isolate - this is similar to Accept Combination in VS Code, but it is line-level. It isolates the chosen line to be one above its match in the other pane.

[hediet]

That's a good idea, thanks! The implementation could look like this:

• There could be a separate merge editor view next to "PROBLEMS":
• This view could list manually created hunks, with an option to reset them
• the diff algorithm would only compute line-based diffs outside between manually aligned hunks
• character level diff would still be computed for every hunk (both for manually and automatically created hunks)

Also, can you share your merge conflict for future reference? (Using the Copy Merge Editor State as JSON command)

[orgads]

@hediet I can't reproduce with a minimal example. Sent you the JSON of the original merge by mail.

[swythan]

Is this a reasonable place to request the same functionality in the 2-way diff as well?

[hediet]

@swythan Please create a different feature request. Also, please attach some example for which this feature would be really useful.