Ladsgroup added a comment.
In T223207#5179529 <https://phabricator.wikimedia.org/T223207#5179529>, @Michael wrote: > That seems to be worse than no conflict detection at all. Yeah > I'm conflicted on that one. Wouldn't the ideal state be that we try to make a 3-way-merge and only report a conflict if that fails? So we do a 3-way merge but the problem is that it fails for two additions of forms because they would claim "L1-F1" at the same time. >> - Do not support conflict detection for adding form and senses and add them regardless but it wouldn't solve the issue of not being to able edit a form twice without refreshing. > > That would mean to not merge the parent patch at all. Why wouldn't that solve the issue? It seems to work fine right now 🤔 it means also reverting some parts in API but my frontend patch also sends baserevid for removing a form or editing them. TASK DETAIL https://phabricator.wikimedia.org/T223207 EMAIL PREFERENCES https://phabricator.wikimedia.org/settings/panel/emailpreferences/ To: Ladsgroup Cc: alaa_wmde, Addshore, Aklapper, gerritbot, Michael, Ladsgroup, darthmon_wmde, Nandana, Lahi, Gq86, GoranSMilovanovic, QZanden, LawExplorer, _jensen, rosalieper, Jonas, Wikidata-bugs, aude, Lydia_Pintscher, Mbch331
_______________________________________________ Wikidata-bugs mailing list Wikidata-bugs@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikidata-bugs
