Le 28/05/2014 11:16, [email protected] a écrit :
Hi Thierry,
On Wed, May 28, 2014 at 10:44 AM, Goubier Thierry
<[email protected] <mailto:[email protected]>> wrote:
On which platform are you commiting / merging ? This looks strange:
.st files should be multi-line, not one line.
CentOS 6 Linux
Well, have you set any strange options in the git repository itself?
I've seen in the man pages stuff about automatic line ending conversions.
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 :))
Yeah, meld here... Or vimdiff
At least there is a tool :)
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 :(
Mmmh, anything not even close to a draft and some notes are welcome!
I haven't yet set it to generates the chapter, but it is the GitAndPharo
chapter (and I have a GitAndPharoTutorial repository on github to go
along, with pre-prepared branches to let people experiment the merge).
I'll be presenting that during the next MooseDay, so it can be an
occasion to talk.
Yeah, I think that I can come over for the first day to listen you that
Git talk of yours and show you our thing.
Cool. It'll be a pleasure :)
Thierry
BTW http://www.doesnotunderstand.org/MOOSEDayUPMC/ says "Thuesday". I do
not know what "Thuesday" means, but as the next day looks like "Friday",
I'd advise someone put "Thursday" (or is it Tuesday after all?).
Schedule
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.
looks weird too.
Phil
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
<tel:%2B33%20%280%29%201%2069%2008%2032%2092> / 83 95
--
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
