Hi David, On Tue, Jul 02, 2013 at 05:59:36PM +0200, David Engster wrote: > 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.
Yes, exactly that. I have stopped using multiple machines for a year now, so I do not have an example at the moment. My history is pretty linear these days :). If I can find the time, I will try work up an example, but that is a big if. That said, I think you might be right. Possibly it could be resolved by just changing the algorithm, I don't know why I never tried that though. Cheers, -- Suvayu Open source is the future. It sets us free.
