Skip to content

Branching: render merge/sync conflicts as a readable table on a TTY #169

Closed

Description

@thomaschristory

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

  1. thomaschristory commented on Oct 24, 2026

    @thomaschristory
    OwnerAuthor

    Claiming: render details.conflicts as a Rich table on TTY stderr; JSON unchanged. Branch: feat/conflict-table.

  2. thomaschristory commented on Oct 24, 2026

    @thomaschristory
    OwnerAuthor

    PR opened: #205

  3. thomaschristory commented on Oct 24, 2026

    @thomaschristory
    OwnerAuthor

    Fixed by #205 (merged). Ships in v1.9.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancementNew feature or request

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions