2014-05-28 10:44 GMT+02:00 Goubier Thierry <[email protected]>: > Hi Phil, > > Le 27/05/2014 20:38, [email protected] a écrit : > > Hello, >> >> I am working with Sebastian on some code and we tried out filetree:// >> >> We have our packages saved there on disk and then we commit/push them on >> the git server. >> >> Now, as we develop and then need to merge, I find it hard to do those >> merges on the .st files. >> >> As ^M is used as separator, the merge tools seem to have a difficult >> time and show us 2 huge lines. >> > > On which platform are you commiting / merging ? This looks strange: .st > files should be multi-line, not one line. > > I've patched MC model (MethodDefinition and class comments) with a few withSqueakLineEndings (sorry Pharoers for the Squeakism) to just ignore the line ending differences. Maybe I should publish, but my feeling was that there should be a better place (upstream) for this...
> What is the current best practice for merging packages that way? >> > > As others said, probably the best is the GitFileTree-MergeDriver to > minimize conflicts with FileTree Monticello metadata, but I'd say it's > complex to setup at the moment, and the git mergetool that Dale has in ToDe > (to avoid using meld :)) > > I'm trying to find the time to document and set a sample git repo in the > PharoForTheEnterprise book with all the different ways to merge: > > - pure FileTree > - FileTree + GitFileTree merge driver > - GitFileTree + binary merge on metadata > - GitFileTree + GitFileTree merge driver > > But I'm not finding the time I need to finish that :( > > I'll be presenting that during the next MooseDay, so it can be an occasion > to talk. > > 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 > >
