#35 Suggestion - conflicts
Hi!
I would suggest some optional checking for potential
conflicts to make sure that their is no problem with
automatic 3-files merging:
If they are some changes selected automatically from B
and C in the same zone (defined as a given number of
lines / or appearing in the same function), the user
could be notified for a potentiel conflict and asked for a
manual check.
For instance, think about a bug correction involving two
lines 5 lines apart, conflicting with a new version (with
an evolution) : if the changes do not have lines in
common, parts would be automatically taken from B,
another from C (because comparison is done line by
line), but it would be interesting to check for potential
problems (potential "logical conflict").
What do you think about that?
Thanks!
Emmanuel
msg [ a t ] altern.rg
Logged In: YES
user_id=584435
Hi Emmanuel,
I've also considered this theoretical problem for some time, but I didn't
actually do anything about it because I never came across a real merge
problem where this would have helped.
I am aware of certain problematic situations, but no specific distance
would be enough to cover every case, and to inform the merger about
each possible such logical conflict would bring (too) many false alarms
in real situations.
But if you had a real problem that would have been avoidable by such
an algorithm, I would be interested to learn more.
Cheers,
Joachim