Hi Alexandre,
Le 10/09/2015 17:40, Alexandre Bergel a écrit :
Hi!
I am not sure to understand. There is a fair amount of tools for got to
deal with conflict. Sure, we could imagine compelling scenarios to have
the conflict merger in Pharo. But I do not feel this is that necessary
for now.
Solving MC conflicts with tools like meld isn't fun. When it is for
Metacello version files, it's allmost impossible to correct properly.
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.
Oh, by the way, for those who would like to try: git does not know how
to properly merge two conflicting class definitions in the chunk format,
so conflicts would still be present...
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?
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.
