I'm often doing complex merges, and I'm generally very much pleased with how Beyond Compare helps me handle conflicts in code blocks.
Until it comes down to conflicting edits to the same single line.
An example would be adding a new function parameter in two branches I'm trying to merge.
common base: f(a)
ours: f(a, b)
theirs: f(a, c)
If if were for added whole lines, I would just hit "Use left then right" or something like that, and the problem would have been solved in an instant.
But with the line, I can't even see the difference visually! This is a simple case, but when a function has ten parameters and something has been changed in the middle, it's very hard to tell. And even harder to merge.
You can look at the current lines in their special view one under another, and try to notice the diff. It's only highlighted in red and there is no fancy "added/removed" highlighting for text parts like there is for whole lines.
Then there's another problem to apply the edits, I often end up picking both lines into the merge pane (by "use left then right" on the line) and then manually copypasting pieces of text between them to make a single version.
So, is there a mode for merging within the line -- Horizontal Merge -- where I can see added/moved blocks and pick actions like "use left then right" for blocks of characters within the line?
If not, can you add one?
Until it comes down to conflicting edits to the same single line.
An example would be adding a new function parameter in two branches I'm trying to merge.
common base: f(a)
ours: f(a, b)
theirs: f(a, c)
If if were for added whole lines, I would just hit "Use left then right" or something like that, and the problem would have been solved in an instant.
But with the line, I can't even see the difference visually! This is a simple case, but when a function has ten parameters and something has been changed in the middle, it's very hard to tell. And even harder to merge.
You can look at the current lines in their special view one under another, and try to notice the diff. It's only highlighted in red and there is no fancy "added/removed" highlighting for text parts like there is for whole lines.
Then there's another problem to apply the edits, I often end up picking both lines into the merge pane (by "use left then right" on the line) and then manually copypasting pieces of text between them to make a single version.
So, is there a mode for merging within the line -- Horizontal Merge -- where I can see added/moved blocks and pick actions like "use left then right" for blocks of characters within the line?
If not, can you add one?
Comment