4 ms·
Personally I long for a syntactic merge-tool. Every time Syncthing hiccups for some reason, I'm up for a merge session with my Org-mode files, in the vein of: ‘
by aasasd 5y ago
Personally I long for a syntactic merge-tool. Every time Syncthing hiccups for some reason, I'm up for a merge session with my Org-mode files, in the vein of: ‘These properties look just like those ones, only with a different timestamp... Oh lookie, and the heading is totally changed. Let me merge this new heading all over the old one, and then pop in the old one after it.’ Dammit, it's just a whole new heading added with properties. This happens with every language heavy on markup.
However, I'm not sure if Org markup lends itself to structuring that would allow proper diffing—even with just the headings.
- teknopaul 5y agoBe good to have different git merge strategies per file type. e.g. A merge that knows properties files support the same property added in different places but only once is needed. And another strategy if order is significant. Cool to have an HTML merge that recognises the tree structure and supports merging tags and having the indentation follow some rules. I believe git supports merge strategies, its been on my todo list forever.