denker at iam.unibe.ch
Wed Aug 18 15:54:24 UTC 2004
Am 18.08.2004 um 17:15 schrieb Alexandre Bergel:
> I am curious to see when conflicts occur most of the time. Is there a
> typical scenario for this?
conflicts happen if two people edit the same method. So even if the
change is at two different
parts of the method, we get a conflict.
There are not that many changsets that edit the same methods, one case
which is the most
common is reftoring: Somebody renamed a method (or moved a mthod to
another class) that
is used a lot. So all those many methods needs to be changed (in a
Any other change that by chance edits the same methods now is a
One thing that could be done is to make merging more intelligent. e.g.
CVS does a good job
(most of the time) to merge just by looking at the context. Just using
a single method is not goog enough.
Another thing that would be nice: A good GUI for evaluating/displaying
and resolving conflicts. Conflictchecker
is a nice step in the right direction, but resoving conficts is not yet
as easy as it should be.
More information about the Squeak-dev