When the next version is chosen for merging an attachment and the previous version has been deleted, the merge should always contain the next version even if a conflict is registered. Right now the conflict is registered but no attachment is added. For a real life usecase impact, see CRAPP-394. |