I think I have run into this with Keynote (esp. the latest version). I had some notes on dealing with rebase/merges conflicts here http://www.win-vector.com/bl

I think I have run into this with Keynote (esp. the latest version). I had some notes on dealing with rebase/merges conflicts here http://www.win-vector.com/blog/2013/10/resolving-git-pseudo-conflicts/ http://www.win-vector.com/blog/2013/10/resolving-git-pseudo-... , but this is another wrinkle.