> Solving MC conflicts with tools like meld isn't fun. When it is for Metacello > version files, it's allmost impossible to correct properly.
I do not see why. It works well for other languages, I see no reason why it would not work in Pharo. > >> One question I have: is mcz the most appropriate? Why not simply doing a >> fileout of the package? And having one .st file per package. > > You need the mcz (in fact, Monticello) support for versions to have > Metacello: configurations, baselines and all the like. I think projects like > Seaside and Moose would not be doable without that. Well, if you have git, then the baseline is rather simple right? > But, all well considered, relying only on the underlying vcs for versions, > but writing chunk files, could it work? With the gitfiletree framework, all > version / meta information is external to the source files, so Metacello > could use that and have everything it needs. Would someone be interested by > that? What do you mean by that? What you are suggesting, is it really more than fileout a source from a package? I am probably missing something obvious here. Cheers, Alexandre > > Thierry > >> Alexandre >> >> >> Le 9 sept. 2015 à 11:38, Thierry Goubier <thierry.goub...@gmail.com >> <mailto:thierry.goub...@gmail.com>> a écrit : >> >>> - A tool to resolve merge conflicts in Pharo. We should reuse >>> the diff >>> widget we have. >>> >>> >>> Dale proposed some tools: a diff parser/reader? >>> >>> A reader for files with conflict markers. > >
