May 27, 2014
6:38 p.m.
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