Skip to content

Warn when parallel worktrees modify the same files #141

Description

@liam-russell

Problem

Parallel work in worktrees — agent fleets or humans — fails at merge time when two branches touch the same files. Nothing warns while the work is in flight; you find out when the second merge into the orchestration/base branch conflicts.

Proposal

Relates #91 (merge-conflict resolution UI) — this is the early warning; #91 is the cure.

Metadata

Metadata

Assignees

No one assigned

    Labels

    P2Table stakes — expected of any polished Git GUIarea:uxUser experience & interaction designenhancementNew feature or request

    Type

    No type

    Fields

    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions