# Handle remote checkout conflicts without duplicate local branch · flambo/t3code

[View on GitCafe](https://git.cafe/flambo/t3code/commit/7a897e9b1fb1620371417650317f6a8c96972b6d)

Repository: [flambo/t3code](https://git.cafe/flambo/t3code)

Visibility: public

Requested revision: 7a897e9b1fb1620371417650317f6a8c96972b6d

Requested commit: 7a897e9b1fb1620371417650317f6a8c96972b6d

Commit: 7a897e9b1fb1620371417650317f6a8c96972b6d

Tree: 7696058bed40c5c18b63a4fb0a9276de13eb30cc

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Handle remote checkout conflicts without duplicate local branch

- fall back to plain checkout (detached HEAD) when `--track` would clash with an existing local branch
- add GitCore coverage for the conflict fallback path
- simplify branch-name derivation in BranchToolbar to consistently strip the first remote segment

```

## Parents

- [0595cc87ef192793dd0d86cf48efa51860a17899](https://git.cafe/flambo/t3code/commit/0595cc87ef192793dd0d86cf48efa51860a17899?format=markdown)

[Source at this commit](https://git.cafe/flambo/t3code/tree/7a897e9b1fb1620371417650317f6a8c96972b6d?format=markdown)