Robert Widhopf-Fenk <[EMAIL PROTECTED]> writes: > But merging this one creates a conflict. IMHO this should > not happen, as it is just a merge of patches I have merged > already.
Yes, but in the meantime, I had modified some of Masatake's code (there was a typo in a comment) without merging from Stefan, this explains the conflict. About the code duplication, I don't understand. I think we should switch to a real star-merge syle of merging soon to avoid this problem. For that, we will need to implement the "--skip-missing" option in xtla. After that, people will merge only from the main branch or from external contributors, and the main branch will merge each branch one by one. -- Matthieu
