Git Merge Conflict Explainer — illustrative example

INPUT
Resolve this simplified HTML conflict: base button was <button type="button">Save</button>. Branch A changes its label to Save draft. Branch B adds disabled because submission is unavailable.

RESULT
<button type="button" disabled>Save draft</button>

Both changes are retained: the new label and the unavailable state. Confirm when the application should remove disabled; the merged markup alone does not implement that state transition.

REVIEW
A conflict resolution should preserve intended changes from both sides when they are compatible. Ask about business behavior when syntax alone cannot decide.

This is a teaching example, not a live execution record.