Skip to content

task-observer: docs/ai/git updates from 2026-05-11 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
divad12 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

task-observer: docs/ai/git updates from 2026-05-11 #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions docs/ai/git.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@ across a rebase.
Before using the exception, tell the user the ramification: the target branch
will include a merge commit, but conflict resolution happens once.

## Worktrees

Before creating a new worktree, check whether a clean suitable one already exists:

```bash
git worktree list
```

If an existing worktree has no uncommitted changes and no branch-only commits ahead of the target, fast-forward it to the target branch and use it instead of creating another. This avoids unnecessary workspace sprawl and the recovery overhead of deciding which worktree owns which work later.

If work accidentally landed in the main checkout, checkpoint it (commit or stash) first, then reuse a clean worktree rather than adding another.

## Guardrails

### Never `git reset --hard` on the target branch
Expand Down