On Tue, May 27, 2014 at 9:21 PM, Nicolas Cellier < [email protected]> wrote:
> > 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. > 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... Phil > > >> 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 >> >> >> >
