> On 08 Jul 2015, at 12:46, Serge Stinckwich <[email protected]> wrote: > > Yurij post also an explanation recently here: > http://code.yuriy.tymch.uk/2015/07/pharo-and-github-versioning-revision-2.html
That link does not seem to work ... > > On Wed, Jul 8, 2015 at 12:31 PM, Peter Uhnák <[email protected]> wrote: >> Hi Alex, >> >> I've been troubled by this some time ago, so Thierry and Dale gave me >> exhaustive explanation here >> http://forum.world.st/Metacello-GIT-methodProperties-json-td4818097.html >> >> As for merging via git, there is also mentioned MergeDriver that's very easy >> to use and should be able to resolve most problems. >> >> Peter >> >> On Wed, Jul 8, 2015 at 12:18 PM, Alexandre Bergel <[email protected]> >> wrote: >>> >>> Hi! >>> >>> Do I still need to press the merge button in Monticello when I am working >>> on a filtree git repository? >>> I understand that no since the merging has to be done by Git, and not by >>> monticello. >>> >>> I tried to not do the merge in monticello, but I get some conflicts when >>> doing the git merge. For example: >>> >>> CONFLICT (content): Merge conflict in >>> Hackathon.package/monticello.meta/version >>> CONFLICT (content): Merge conflict in >>> Hackathon.package/HProject.class/methodProperties.json >>> CONFLICT (content): Merge conflict in >>> Hackathon.package/HClass.class/methodProperties.json >>> >>> Why do we need this methodProperties.json and version files? Shouldn’t git >>> handle this? >>> >>> How should I merge these files? Any experience? >>> >>> Cheers, >>> Alexandre >>> >>> -- >>> _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: >>> Alexandre Bergel http://www.bergel.eu >>> ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;. >>> >>> >>> >>> >> > > > > -- > Serge Stinckwich > UCBN & UMI UMMISCO 209 (IRD/UPMC) > Every DSL ends up being Smalltalk > http://www.doesnotunderstand.org/ >
