How to handle conflict resolution in baselines?
Everyone, In a baseline in a project I am working on I have a dependency on both Magritte and Seaside. Magritte loads fine, but when Seaside loads, Monticello declares a conflict on the Grease package. You can see the WIP baseline here: https://github.com/ericbmerritt/profeos/tree/feat/working-goals/BaselineOfPr... . So far, I haven't found a solution to resolve conflicts in the spec. The closest solution I have found is here: https://github.com/CCMi-FIT/kendrick-modeller/blob/9c76ff8170c67d5472cc1e1b7... It works but seems to be stepping out of the declarative form of baseline definition. Is there another solution? Thanks, Eric
Hi Eric, This is something I ran into a while ago as well. Since then, I load all my (top level) project baselines using #onConflictUseLoaded. So in your case, I would load Profeos with something like the following: Metacello new repository: 'github://ericbmerritt/profeos:main'; baseline: 'Profeos'; onWarningLog; onConflictUseLoaded; load. Does that work for you? Kind regards, Jonathan van Alteren Guild Member | Object Guild Software that works with you jonathan@objectguild.com On 25 Oct 2022, 00:42 +0200, Eric Merritt <eric@merritt.tech>, wrote:
Everyone,
 In a baseline in a project I am working on I have a dependency on both Magritte and Seaside. Magritte loads fine, but when Seaside loads, Monticello declares a conflict on the Grease package. You can see the WIP baseline here: https://github.com/ericbmerritt/profeos/tree/feat/working-goals/BaselineOfPr....
So far, I haven't found a solution to resolve conflicts in the spec. The closest solution I have found is here: https://github.com/CCMi-FIT/kendrick-modeller/blob/9c76ff8170c67d5472cc1e1b7...
It works but seems to be stepping out of the declarative form of baseline definition. Is there another solution?
Thanks, Eric
participants (2)
-
Eric Merritt -
Jonathan van Alteren