Hacker News new | comments | show | ask | jobs | submit login

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-... , but this is another wrinkle.



Applications are open for YC Winter 2018

Guidelines | FAQ | Support | API | Security | Lists | Bookmarklet | DMCA | Apply to YC | Contact

Search: