Merge pull request #1064 from 0xldr/mip102c2-amendment

MIP102c2-SP33: Add MIP102c4: Simultaneous Edit Resolution Process

MIP102/MIP102.md

@@ -42,6 +42,9 @@ A process component which defines a method and template for the amendment of an
 **MIP102c3: MIP Removal Process**  
 A process component which defines a method and template for the removal of an accepted MIP.
 
+**MIP102c4: Simultaneous Edit Resolution Process**
+A process component which defines the process that must be followed if multiple MIP102c2 subproposals are passed that seek to edit the same component, or components, of a MIP or Alignment Artifact within the same Governance Cycle.
+
 ## Motivation
 
 For the implementation of Endgame, the Maker Constitution will take over most governance processes and functions, however some existing MIPs will be required to stay in place to make the transition easier and save work. This MIP provides the necessary rules to enable arbitrary changes to existing MIPs in order to make them compatible with the Maker Constitution.
@@ -74,6 +77,8 @@ All MIP102c2 subproposals must use the template located at **[MIP102c2-Subpropos
 
 When making a MIP102c2 Subproposal to edit one or more Scope Bounded Mutable Alignment Artifacts, the proposer must specify whether it is an **Article 1 Edit** or a **General Edit**. If the MIP102c2 is an Article 1 edit, the only parts of the Scope Bounded Mutable Alignment Artifacts that are changed are their Article 1 elements, regardless else the Subproposal specifies in edits for those MIPs. If the MIP102c2 Subproposal is a General Edit, then it cannot modify the Article 1 elements of the Scope Bounded Mutable Alignment Artifacts and will leave them intact. Article 1 Edits and General Edits can overlap and coexist, meaning if an Article 1 Edit and a General Edit are both approved in the same monthly governance cycle, the changes from both Subproposals are merged together and applied.
 
+MIP102c2 subproposals are not allowed to include language that aims to prevent other proposals from editing the same component of an Alignment Artifact within the same Governance Cycle. If multiple simultaneous MIP102c2 subproposals that seek to edit the same part of a MIP or Alignment Artifact are approved by voters, the procedure documented in MIP102c4 must be followed.
+
 ### MIP102c3: MIP Removal Process
 
 MIP102c3 is a Process MIP component that allows the removal of one or multiple Accepted MIPs. MIP102c3 subproposals have the following parameters:
@@ -84,3 +89,12 @@ MIP102c3 is a Process MIP component that allows the removal of one or multiple A
 - **Other Requirements**: None.
 
 MIP102c3 subproposals must use the template located at **[MIP102c3-Subproposal-Template.md](https://github.com/makerdao/mips/blob/master/MIP102/MIP102c3-Subproposal-Template.md)**.
+
+### MIP102c4: Simultaneous Edit Resolution Process
+
+Where voters approve multiple MIP102c2 Subproposals that seek to edit the same component or components of a MIP or Alignment Artifact within the same Governance Cycle, the process contained in MIP102c4 must be followed. This process only applies to the specific components that are being simultaneously edited. Other amended components that do not have edits in simultaneous proposals may be merged, unless they are dependent on the component that does have simultaneous edits. The process is as follows:
+
+- Where simultaneous edits are _non-conflicting, logically compatible_, Governance Facilitators will consolidate them into a single edit either by stitching them together in the affected component or by stringing one after the other as a new component. Any action taken by the Governance Facilitators in this regard will be documented publicly and preferably be available prior to the end date of the relevant ratification polls.
+- Where simultaneous edits are _conflicting, logically incompatible_ and cannot be coherently reconciled, it falls to voters to decide which of the conflicting subproposals they wish to accept. If there are two conflicting subproposals, a subsequent binary vote is appropriate. In the event there are more than two conflicting subproposals, the Governance Facilitators may choose a suitable polling method that allows voters to choose between multiple options. The difference between the conflicting amendments must be clearly presented so that voters can make an informed choice on their preferred option.
+
+Any poll resulting from MIP102c4 will take place during the Weekly Governance Cycle immediately following the closure of the ratification polls and last for three days.