> On 29 Nov 2014, at 07:53, Ben Coman <[email protected]> wrote:
>
>
> 2014-11-27 10:02 GMT+01:00 stepharo <[email protected]
> <mailto:[email protected]>>:
>
>>
>> The fact that Athens are part of Pharo distribution don't means, that its
>> repository should be abandoned and all updates should come directly to
>> Pharo. That would be a huge mistake.
>>
>> That's how I've done it recently.
>>
>> I'll merge the changes from pharo -> athens repository.
>
> Thanks for doing that!
>
> Hm, actually I don't know how to do that :)
> Whats the common way for merging this changes back?
> Do I just
> open Monticello Browser,
> select the Athens packages (Athens-Balloon/Athens-Cairo/Athens-Core ..)
> and just save them in the 'http://smalltalkhub.com/mc/Pharo/Athens/main
> <http://smalltalkhub.com/mc/Pharo/Athens/main>' - repository ?
>
I would say
-> merge with the repo (if there are changes)
-> commit back to the repo
-> sync with maintainer
-> Maintainer should give OK and make a new Config
Then we should make sure to have the same in the image as in the repo.
Marcus
