that i don’t know. the change is already there or the slice is actually empty. nothing to do with the app, in that case :)
Esteban > On 17 Oct 2014, at 12:28, Marcus Denker <[email protected]> wrote: > > >> On 17 Oct 2014, at 12:21, Esteban Lorenzano <[email protected] >> <mailto:[email protected]>> wrote: >> >> that means most probably a merge conflict (still not handled by new >> integrator app). >> Sorry, I will fix it soon :) >> > > But I wonder why when I merge the not-integrated slices, it claims that there > is no change? > > >> Esteban >> >>> On 17 Oct 2014, at 12:19, Marcus Denker <[email protected] >>> <mailto:[email protected]>> wrote: >>> >>> We will have to revert this. >>> >>> -> the changes are not there >>> -> yet when I merge the Slice it claims there are no changes. >>> -> So we have to revert. >>> >>> On Fri, Oct 17, 2014 at 11:56 AM, GitHub <[email protected] >>> <mailto:[email protected]>> wrote: >>> Branch: refs/heads/4.0 >>> Home: https://github.com/pharo-project/pharo-core >>> <https://github.com/pharo-project/pharo-core> >>> Commit: cd6a3036bde6d73d3e2502aca8caacaac75dc1db >>> >>> https://github.com/pharo-project/pharo-core/commit/cd6a3036bde6d73d3e2502aca8caacaac75dc1db >>> >>> <https://github.com/pharo-project/pharo-core/commit/cd6a3036bde6d73d3e2502aca8caacaac75dc1db> >>> Author: Jenkins Build Server <[email protected] >>> <mailto:[email protected]>> >>> Date: 2014-10-17 (Fri, 17 Oct 2014) >>> >>> Changed paths: >>> A ScriptLoader40.package/ScriptLoader.class/instance/pharo - >>> scripts/script310.st <http://script310.st/> >>> A ScriptLoader40.package/ScriptLoader.class/instance/pharo - >>> updates/update40310.st <http://update40310.st/> >>> M >>> ScriptLoader40.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st >>> >>> Log Message: >>> ----------- >>> 40310 >>> 14246 CompiledMethod>>hash can produce clashes >>> https://pharo.fogbugz.com/f/cases/14246 >>> <https://pharo.fogbugz.com/f/cases/14246> >>> >>> 14257 Replace Announcer>>#on:send:to:s senders in NativeBoost-Core >>> https://pharo.fogbugz.com/f/cases/14257 >>> <https://pharo.fogbugz.com/f/cases/14257> >>> >>> 14253 MC dependency warning should name which package is failing to load >>> https://pharo.fogbugz.com/f/cases/14253 >>> <https://pharo.fogbugz.com/f/cases/14253> >>> >>> http://files.pharo.org/image/40/40310.zip >>> <http://files.pharo.org/image/40/40310.zip> >>> >>> >>> >>> >>> >>> -- >>> -- >>> Marcus Denker -- [email protected] <mailto:[email protected]> >>> http://www.marcusdenker.de <http://www.marcusdenker.de/> >> >
