Le 27/05/2014 22:19, Esteban Lorenzano a écrit :
On 27 May 2014, at 17:09, [email protected] <mailto:[email protected]>
wrote:
On Tue, May 27, 2014 at 9:21 PM, Nicolas Cellier
<[email protected]
<mailto:[email protected]>> wrote:
2014-05-27 20:41 GMT+02:00 Johan Brichau <[email protected]
<mailto:[email protected]>>:
Have you tried this?
https://github.com/ThierryGoubier/GitFileTree-MergeDriver
Not sure about the ^M problem though...
Johan
I second this, with GitFileTree it solves most problems of false
conflicts caused by MC metadata.
For true conflicts, I did not inquire.
Ok, will have a look.
At first sight, it looks scary and less friendly than a plain old MCZ
merge.
But... git is the standard and it is painful to have to maintain
things in two places…
filetree format is buggy when merging. Reason is is keeping monticello
metadata and that does not plays very good with git (bah, it does not
play good at all).
This is in no part due to the fact that we don't set up git to play nice
with this metadata...
We are working (Max is doing some work there) in a better integration
with git, where we can drop all those metadata files and rely on git
information (it is there, we just need to use it). But as always, things
needs time and time is scarce :(.
Yes. I'm expecting a lot from that project, even if I'm not sure about
that "removing the metadata" stuff. Using git as the source of the
metadata isn't hard.
My recommendation in the mean time is to try gitfiletree. There is a
good chance that it fixes your problems.
It has issues with the merge conflicts, still. Hence the talk about the
merge driver and the merge tool.
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
