On 27 May 2014, at 17:09, phil@highoctane.be wrote:

On Tue, May 27, 2014 at 9:21 PM, Nicolas Cellier <nicolas.cellier.aka.nice@gmail.com> wrote:

2014-05-27 20:41 GMT+02:00 Johan Brichau <johan@inceptive.be>:

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).

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 :(.

My recommendation in the mean time is to try gitfiletree. There is a good chance that it fixes your problems.

Esteban

Phil

On 27 May 2014, at 20:38, phil@highoctane.be wrote:

> 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.
>
> What is the current best practice for merging packages that way?
>
> TIA
> Phil