Suvayu Ali writes: > I have noticed that git *always* conflicts with TODO state changes. It > seems changes to a headline is not easy to resolve.
You mean you change state in a file and git fails to merge this on the other side, although you didn't change the same line there? I've never seen such a spurious merge conflict with my Org files. Could you give an example? It might be that simply switching to another diff.algorithm and maybe also increasing diff.context would get rid of this. -David
