Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

I wondered about this, but I pose this question to you: what happens if you have a merge problem with, say, a libreoffice doc or something. How do you handle that? I use hg, but I imagine my plight would be similar. TIA.


I don't keep anything but text files in my dotfile repo, so I haven't had to deal with this.




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: