> Lukas in my example in fact Presenter was removed as well as other > methods. > Then since they were present at the time jannik commited they reappear > when I merge > and I do not see why they are not at least tagged with conflicts.
If you remove Presenter and Jannik does not touch it, then it should remain removed after the merge. If you remove Presenter and Jannik does touch it, then you should get a conflict. Presenter can only reappear, if in your delta or in the delta of Jannik the Presenter is added (which doesn't seem to make sense, so I don't understand). Lukas -- Lukas Renggli http://www.lukas-renggli.ch _______________________________________________ Pharo-project mailing list [email protected] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
