Reconcile overlapping document edits from a common base

Two people can improve the same document in ways that do not fit together. Choosing the newer file may discard useful work, while combining every changed sentence can produce contradictory instructions. Reconcile proposals against a common base and the authors' intended effects. The output is a merged draft with a resolution note, not a judgment about what an earlier meeting actually agreed.

Preserve the base and both proposals

Use an expressly fictional handbook paragraph: “The review coordinator collects questions. The coordinator approves routine wording changes. Exceptions go to the project owner.” One proposed version renames the coordinator as the review facilitator. The other removes the approval sentence because that responsibility belongs elsewhere.

Keep the unchanged base and label the two proposals clearly. Note which version each author started from. If they did not share the same base, identify that discrepancy before treating their differences as parallel edits. Otherwise, an earlier inherited change can be mistaken for a new proposal and discussed with the wrong author.

Locate changed intervals and dependent wording

Mark each addition, deletion, and replacement relative to the base. Apply truly independent changes provisionally, but inspect the surrounding context. An added explanation may depend on a sentence the other proposal deletes. A renamed role can leave an old reference later in the section even when the changed paragraph reads smoothly.

In the fictional example, replacing coordinator with facilitator does not settle who approves routine changes. Removing the approval sentence also leaves a question about where ordinary wording decisions go. Record these as semantic dependencies, not merely two incompatible pieces of text. A draft with no overlapping characters can still contain conflicting instructions.

Ask what each edit is meant to achieve

Have the authors explain the effect they want and the evidence or authority supporting it. The first may want a clearer role name; the second may want the handbook to stop assigning approval to that role. Those intentions can coexist if the responsible owner confirms the actual approval route.

Do not assume the deletion author wants the entire role removed, or that the renaming author wants every existing power preserved. Ask before inferring either. Separate proposed wording from an authority decision the authors cannot make. Keep a question open if the relevant owner has not established who may approve routine changes.

Write one resolution and track its effects

A provisional merged paragraph could retain the facilitator's question-collection role while linking wording decisions to the approved decision route. Use that formulation only once the route is established. Record how the revision preserves each accepted intention: clearer naming survives, and unsupported approval responsibility no longer appears.

Keep independent additions from both proposals when they still make sense. For every disputed interval, note the resolution, its reason, who accepted it, and any remaining question. Avoid copying both conflicting alternatives into the body merely to preserve contributions. The resolution note can retain the discussion without requiring readers to choose between contradictory instructions.

Check the merge against both authors' purposes

Read the complete section, including references outside the edited paragraph. Ask each author to identify the surviving effect of their accepted proposal. Then have a separate reader explain who collects questions and where a routine wording decision goes.

If a deletion removed the only explanation needed to apply a retained instruction, reopen that dependency. If either accepted intention has disappeared, the merge is incomplete even when the prose looks polished. Adopt the draft through the team's normal document process only after unresolved conflicts are visible and the relevant acceptance is recorded. Mechanical smoothness is useful, but preserved meaning is the finish check.