> On 29 Oct 2014, at 23:35, Andrei Chis <
[hidden email]> 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).
Marcus