Re: [Pharo-dev] about spurious conflicts

The reason is that the merge does not find the “last common” package. There is an issue that solves this (adding temporarily the Pharo5 repo). Marcus

On 17 May 2016, at 22:08, stepharo <stepharo@free.fr> wrote:

Hi

while migrating some of the issues from 50 to 60, I noticed that many of the conflicts are

not conflicts since the code of both methods and the protocols are the same.

Does anybody experienced the same?

Here are some examples and I'm puzzled.

https://ci.inria.fr/pharo/job/Pharo-6.0-Issue-Validator/417//artifact/valida...

https://ci.inria.fr/pharo/job/Pharo-6.0-Issue-Validator/418//artifact/valida...

Stef