Skip to content

refactor: include conflicted file names in pull guidance#97

Merged
ori0o0p merged 1 commit intomainfrom
feature/git-conflict-file-guidance
Feb 16, 2026
Merged

refactor: include conflicted file names in pull guidance#97
ori0o0p merged 1 commit intomainfrom
feature/git-conflict-file-guidance

Conversation

@ori0o0p
Copy link
Member

@ori0o0p ori0o0p commented Feb 16, 2026

Summary

  • enrich git pull conflict guidance by listing conflicted files when available
  • keep fallback conflict guidance when conflict file detection returns empty
  • add regression coverage for conflict file guidance and fallback behavior

Testing

  • swift test --filter GitPanelServiceTests
  • swift test
  • swift build -c release

Closes #96

@ori0o0p ori0o0p merged commit cb7083b into main Feb 16, 2026
1 check passed
@ori0o0p ori0o0p deleted the feature/git-conflict-file-guidance branch February 16, 2026 13:50
ori0o0p added a commit that referenced this pull request Feb 20, 2026
refactor: include conflicted file names in pull guidance
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Show conflicted file names in pull-failure guidance

1 participant