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.
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.
Alexandre
- 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.