about spurious conflicts
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
2016-05-17 22:08 GMT+02:00 stepharo <stepharo@free.fr>:
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...
The packages, these slices depends on, are older than what we have in the image. This packages were only in the inbox. Every new package version (Nautilus for example) we included afterwards, don't have these changes. I am afraid all this changes needs to be redone again.
Stef
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
Yes, I saw the same with Fuel. But a simple manual merge with the latest version fixed that.
Yes. It should be solved by 18251 <https://pharo.fogbugz.com/f/cases/18251/add-50-repo-for-now-so-we-can-merge> 2016-05-17 22:08 GMT+02:00 stepharo <stepharo@free.fr>:
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
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
participants (5)
-
Denis Kudriashov -
Marcus Denker -
Max Leske -
Nicolai Hess -
stepharo