Skip to content

Show conflicted file names in pull-failure guidance #96

@ori0o0p

Description

@ori0o0p

Summary

  • improve Git panel pull conflict guidance by including conflicted file names when available
  • reuse existing conflict detection helper (git diff --diff-filter=U) to provide actionable context
  • keep fallback guidance when file enumeration fails

Why

Current guidance tells users to resolve conflicts but does not show which files are conflicted, forcing extra manual commands.

Scope

  • Sources/Zero/Services/GitPanelService.swift
  • Tests/ZeroTests/GitPanelServiceTests.swift

Acceptance Criteria

  • pull conflict failures include conflicted file paths in the message when detected
  • message remains concise and readable for multiple files
  • fallback generic conflict guidance remains for empty/unknown conflict file results

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions