Today I learned (from this post) how to keep either file in a merge conflict. http://disq.us/t/7hz5c
CleverLibre Social is an inclusive social instance for open discussion, learning, and community. All cultures welcome. Hate speech and harassment strictly forbidden.
