On 30 Oct 2014, at 13:59, Andrei Chis <chisvasileandrei@gmail.com> wrote:On Thu, Oct 30, 2014 at 3:47 AM, Marcus Denker <marcus.denker@inria.fr> wrote:
> On 29 Oct 2014, at 23:35, Andrei Chis <chisvasileandrei@gmail.com> wrote:
>
> Hi,
>
> In a fresh Pharo 4 image I want to merge a package (Glamour-Presentations) but I get a merge conflict.
>
> Nevertheless, the package from the image has no changes and the package cache is empty. Shouldn't there be no merge conflict in this case?
>
I think we do not have the repositories defined correctly for these packages.
(or alternatively, the current packages need to be in the pharo repo which is not the case).Hmm... Now it's behaving even more strangely.When I try to manually merge I sometimes get/don't get the merge conflict.However, when I load that package through a configuration I always get a warning that I have a merge conflict.(ConfigurationOfGTPlaygroundCore project version: '2.0.0') loadIt' strange because it only happens for one method, while this version of GTools has a lot of other changes.