Hi,
Whenever there is a conflict in a 3 way merging, Beyond Compare selects the base line (and marks the line as a conflict). At least in my case this is almost never what I need. The base contains the oldest version, and if both left and right changed, discarding both changes isn't a great default.
What I would like to see is an "automatic" merging of the line as default, while still marking it as a conflict. For example, let's imagine we have:
base.txt:
procedure test(const a:integer; const b: integer);
left.txt:
procedure test(var a:integer; const b: integer);
right.txt:
procedure test(const a:integer; const arg2: integer);
What I would like to see as default for the conflict would be:
procedure test(var a:integer; const arg2: integer);
Do you think it would be feasible? Due to my workflow I get many conflicts like this one, and currently it is a lot of effort to manually solve them all. A default like this (a 3way merge of the line) would help me a lot.
Of course I don't know how much effort it would take (and I hope it isn't that much), but conceptually it would be the same algorithm you use for the 3way merge of lines, but applied to the characters in a single line, of the 3 versions (base, left, right)
Thanks for doing such a great product. Even it this can't be implemented, it still saves me some hours every day. But if it can be implemented, it would just be fantastic!
Adrian.
Whenever there is a conflict in a 3 way merging, Beyond Compare selects the base line (and marks the line as a conflict). At least in my case this is almost never what I need. The base contains the oldest version, and if both left and right changed, discarding both changes isn't a great default.
What I would like to see is an "automatic" merging of the line as default, while still marking it as a conflict. For example, let's imagine we have:
base.txt:
procedure test(const a:integer; const b: integer);
left.txt:
procedure test(var a:integer; const b: integer);
right.txt:
procedure test(const a:integer; const arg2: integer);
What I would like to see as default for the conflict would be:
procedure test(var a:integer; const arg2: integer);
Do you think it would be feasible? Due to my workflow I get many conflicts like this one, and currently it is a lot of effort to manually solve them all. A default like this (a 3way merge of the line) would help me a lot.
Of course I don't know how much effort it would take (and I hope it isn't that much), but conceptually it would be the same algorithm you use for the 3way merge of lines, but applied to the characters in a single line, of the 3 versions (base, left, right)
Thanks for doing such a great product. Even it this can't be implemented, it still saves me some hours every day. But if it can be implemented, it would just be fantastic!
Adrian.
Comment