Loading
feat(mr): show conflicts in plain-text view
Closes #7865 (closed).
glab mr view reports conflicts in the terminal and exposes has_conflicts in JSON, but omits the status when stdout is redirected. Add conflicts: true, conflicts: false, or conflicts: unknown to the plain-text output. GitLab reports the pending states unchecked, checking, and preparing before the conflict result is available. The help also explains how to interpret has_conflicts in JSON.
Regenerated the CLI docs with make gen-docs and added regression coverage for confirmed conflicts, confirmed absence of conflicts, and all three pending states. go test ./internal/commands/mr/view/... passed.
AI assistance was used to develop this change.
/copy_metadata #7865 (closed)
Edited by Himanshu Jha