On Tue, Dec 2, 2014 at 11:58 AM, Esteban Lorenzano <estebanlm@gmail.com> wrote:

On 02 Dec 2014, at 20:41, Yuriy Tymchuk <yuriy.tymchuk@me.com> wrote:

Yes, but my main point is what when I merge, I don��t care about monticello data�� I already have a git version, why do I have to care about the ancestor of monticello version that became different because of cherrypicking.

And this is what we need to fix. We do not need this duplications, and also it makes a lot more difficult to work in several branchs, etc.��

Use Thierry's merge tool and then ignore the monticello meta data ... I am always doing complex merges of all kinds and Thierry's tool takes care of keeping the monticello data consistent while I can manually deal with the "real conflicts".

Until every project on SmalltalkHub has been converted to git, you will need the monticello meta data ... this is something that will not happen overnight ...

Dale