> On 17 May 2016, at 22:08, stepharo <steph...@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/validationReport.html
> 
> https://ci.inria.fr/pharo/job/Pharo-6.0-Issue-Validator/418//artifact/validationReport.html
> 
> 
> Stef
> 
> 

Yes, I saw the same with Fuel. But a simple manual merge with the latest 
version fixed that.


Reply via email to