[Pharo-dev] Support understanding changes

Stéphane Ducasse stephane.ducasse at inria.fr
Wed Nov 6 08:01:07 EST 2013


> 
>>> In the Git world, I'll focus simply on a file format able to store that knowledge, in a way which minimises git-induced conflicts... The goal being that a git merge would recreate a working Smalltalk result (no conflicts) with a correct EPICEA history (eventually recreated from the git stored data).
>>> 
>>> What I know is that a single file in whatever format containing the EPICEA log will be a conflict magnet.
>> 
>> Why conflicting we will change it systematically.
> 
> Because if you merge with git, then you will get conflicts and those will be a pain to fix.

may be they should be ignore while merging but we cannot compute them from git because there are semantics
information so if in the future we want to use fully git we will have to have a solution. 
But for now indeed we should focus on putting that info in MCZ
> 
> Thierry
> -- 
> Thierry Goubier
> CEA list
> Laboratoire des Fondations des Systèmes Temps Réel Embarqués
> 91191 Gif sur Yvette Cedex
> France
> Phone/Fax: +33 (0) 1 69 08 32 92 / 83 95
> 





More information about the Pharo-dev mailing list