On Tue, Apr 21, 2015 at 5:49 PM, Esteban Lorenzano <estebanlm@gmail.com> wrote:

On 21 Apr 2015, at 11:42, Ben Coman <btc@openinworld.com> wrote:

btw, how do you merge Configurations?�� For example, if I fix something "X" in my image and continue to work in it a month while the Image Configurations move forward, how do avoid losing that fix when I update to the latest Configuration ?

you *do not* merge configurations.��


I might have the wrong end of the stick, but I just want to push this idea to the extreme for a moment, since I thought merging was the very essence of collaborative development.�� Git seems to have become popular in part because it makes it very easy to *merge* parallel paths of development. �� How do you avoid feature development interfering with fast bug fixing without multiple paths of development (i.e. multiple Configurations) and hence without making it easy to merge Configurations. ��

Suppose a developer outside the core group submits a feature/bug-fix across five packages of the project's Configuration.�� Should those packages just be dropped into the project's repository? How do you tag them as belonging-together, to simplify review by the project's owner - especially if some of those packages are in different repositories.�� I expect it would be simpler if the outside-developer dropped a Configuration for the feature/bug-fix, and the project owner could *merge* it into their image to view all changes in one step.��

cheers -ben

��
if you fix ��something in a ���configured��� project, you submit your change to proper repository (not as a SLICE, as regular packages), which in time will be included (or not, if ���project owner��� rejects it) in a new configuration that will be included in Pharo.��

that���s how any complex project works��� and that���s how we should work too. SLICES are just a patch that exists because our system still not modular enough.��


Actually I guess it would be useful if a Configuration could be merged with the same GUI that merges a Slice.

well��� monkey and integrator app (integrators use it) does the proper loading.��
But I insist: configurations are not merged: versions are loaded, instead.��

cheers.��
Esteban