02 / 3Chain · 1 step

A merge conflict, right now.

Run /resolving-merge-conflicts. That is the whole chain.

One step. Do not pad it out to look serious.

  1. 01/resolving-merge-conflicts Matt Pocock engineering suite

    Reads both sides, reconstructs what each was trying to do, and resolves against that intent rather than against whichever hunk is easier to keep.

What you do not run

/review — A conflict is not a diff to judge. Review the result afterwards if the merge was large, never during.

/code-review — Same reason. The question right now is what the two sides meant, not whether the code follows house standards.

A one-element chain is a real answer. Padding it to five steps would be the padding, not the help.