[Pharo-users] Re: How to handle conflict resolution in baselines?