Skip to content

conflicts: detect committed changes, not just unstaged #67

@erishforG

Description

@erishforG

Summary

parsec conflicts only detects unstaged changes. Committed changes are not detected — after committing in a worktree, it shows "N workspace(s) skipped (no changes yet)".

Proposed Solution

Use git diff --name-only HEAD...$(git merge-base HEAD base_branch) to compare against the base branch, including committed changes.

Context

Committed changes in 4 worktrees, but parsec conflicts reported "no changes yet" for all of them

Metadata

Metadata

Assignees

No one assigned

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions