When I had conflicts, I usually replaced them with the original source, as they were binary files most of the time, so as not to make you lose your changes, even if it meant deferring mine. I'm sorry if I've made any mistakes, I'm not a git expert. Anyway, we shouldn't have to modify the same files anymore. Concerning the carriage returns I don’t know where it comes from since I have edited on linux only. Note my trial branch should contain all what is published on your branch.
When I had conflicts, I usually replaced them with the original source, as they were binary files most of the time, so as not to make you lose your changes, even if it meant deferring mine. I'm sorry if I've made any mistakes, I'm not a git expert. Anyway, we shouldn't have to modify the same files anymore. Concerning the carriage returns I don’t know where it comes from since I have edited on linux only. Note my trial branch should contain all what is published on your branch.