Something that explains code duplication and conflicts: We didn't remind this to the "new" contributors, but at least Stefan and me have configured our Emacs to delete trailing whitespaces from source files.
Suppose X writes (I've represented trailing whitespaces with `_' for clarity) (defun foo ()_ (bar)) Then, I merge from him and strip this whitespace: (defun foo () (bar)) Then, Y comes and merge from X. He gets (defun foo ()_ (bar)) Afterwards, he merges from me. Tla can't merge our two versions because they are different. In the best case, you'll get a conflict, but if the context has changed between the two versions, this will result in a duplicate. I've updated the HACKING file to ask everybody to configure their Emacs to remove whitespaces. Please, do it, or if you have strong objection to this, please argue here so that everybody disables this config. Thanks, -- Matthieu
