Choosing a tagging scheme for disputed boundaries

Meanwhile, the Shortbread schema, which is planned for osm.org this year, only supports boundary=disputed. So until this Shortbread issue is fixed, an astute mapper hoping to avoid an edit war with other mappers would need to tag both boundary=disputed and disputed=yes, at a minimum, to cover Nextzen/Tilezen, OpenMapTiles, and Shortbread.