-
-
Notifications
You must be signed in to change notification settings - Fork 0
Improve gitwise sync --pull UX for diverged branches #43
Copy link
Copy link
Open
Labels
area/cliCLI argparse, subcommand routing, output formattingCLI argparse, subcommand routing, output formattingarea/docsProject documentation, guidelines, LANGUAGE.mdProject documentation, guidelines, LANGUAGE.mdarea/git-opsGit operations: audit, clean, optimize, worktree, diffGit operations: audit, clean, optimize, worktree, diffkind/improvementEnhancement to existing functionalityEnhancement to existing functionalitypriority/mediumImportant but not urgentImportant but not urgentstatus/acceptedTriaged, validated, ready to work onTriaged, validated, ready to work on
Metadata
Metadata
Assignees
Labels
area/cliCLI argparse, subcommand routing, output formattingCLI argparse, subcommand routing, output formattingarea/docsProject documentation, guidelines, LANGUAGE.mdProject documentation, guidelines, LANGUAGE.mdarea/git-opsGit operations: audit, clean, optimize, worktree, diffGit operations: audit, clean, optimize, worktree, diffkind/improvementEnhancement to existing functionalityEnhancement to existing functionalitypriority/mediumImportant but not urgentImportant but not urgentstatus/acceptedTriaged, validated, ready to work onTriaged, validated, ready to work on
Problem
gitwise sync --pullcurrently fails with a generic message when local and remote have diverged.The command intentionally uses
git pull --ff-onlyfor safety, but users do not get enough actionable guidance.Current message:
Why this is confusing
--pullto "just sync".Proposed improvements
gitwise sync --dry-run --jsonto inspectahead/behindgit pull --rebase(recommended)git pull --no-rebase(merge flow)gitwise sync --pushafter reconciliationgitwise sync.gitwise sync --pull --strategy ff-only|rebase|mergeff-onlyfor backward-compatible safety.Acceptance criteria
sync_pull_divergedwith strategy guidance.Notes
This should be UX-only unless a separate proposal explicitly changes default safety semantics.