diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2026-02-12 16:19:29 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2026-02-12 16:19:29 +0000 |
| commit | 1be46b4fd7a78ce418765ef5467823b7ea5e60eb (patch) | |
| tree | ed474554c9f589492dd93f17ff3bcacb8daa374a /src/lib/git/identify_ahead_behind.rs | |
| parent | c85ca81767d838797f6a1ab6651e9864c3f961c1 (diff) | |
fix: handle existing local branch that is behind when checking out PR
When a PR branch already exists locally, the previous code would silently
move the branch pointer without checking for tracking or fast-forward safety.
Now:
- If branch has tracking: checkout and warn user to git pull
- If no tracking and fast-forward: safely move pointer
- If no tracking and diverged: show copy-paste commands for reset/rebase
- If commit not found locally: suggest fetching
Uses console crate for yellow output instead of hardcoded ANSI codes.
Diffstat (limited to 'src/lib/git/identify_ahead_behind.rs')
0 files changed, 0 insertions, 0 deletions