You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Branching: render merge/sync conflicts as a readable table on a TTY #169
On a terminal, a conflict envelope (exit 10) prints details.conflicts as a raw Python dict via render_to_rich_stderr (nsc/output/errors.py:101). The design asks for a rendered list: object, conflicting fields, and the original / branch / main values.
Fix: when the envelope has details.conflicts and the target is rich stderr, render a table with one row per conflict. JSON output stays unchanged.
Deferred minor from the final review of #167 (NetBox Branching, #166).
Activity
thomaschristory commentedon Oct 24, 2026
Claiming: render details.conflicts as a Rich table on TTY stderr; JSON unchanged. Branch: feat/conflict-table.
thomaschristory commentedon Oct 24, 2026
PR opened: #205
feat(output): render branch merge/sync conflicts as a table on a term…
thomaschristory commentedon Oct 24, 2026
Fixed by #205 (merged). Ships in v1.9.0.