Dec. 1, 2014
12:39 p.m.
On 01 Dec 2014, at 11:40, Marcus Denker <marcus.denker@inria.fr> wrote:
On 29 Nov 2014, at 23:04, Nicolai Hess <nicolaihess@web.de <mailto:nicolaihess@web.de>> wrote:
I don't understand this merge conflict in hte issue validation for case 14288 <https://pharo.fogbugz.com/default.asp?14288> I can manually load the slice and it does not show any conflicts.
I actually looked at it when the same time it failed with the monkye, and I got the same conflicts.
I think this is a bug that might be related to MC not getting the right file to diff sometimes from SmalltalkHub.
I have put it back to review needed to see if it works now.
This time it worked fine, I will integrate it now. Marcus