2014-05-27 20:41 GMT+02:00 Johan Brichau <[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.
> On 27 May 2014, at 20:38, [email protected] 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 > > >
