Skip to content

new-branch.md

Latest commit

 

History

History
60 lines (44 loc) · 2.17 KB

new-branch.md

File metadata and controls

60 lines (44 loc) · 2.17 KB
Raw

New Branch (Flow + jj)

Use this when you want a clean feature branch quickly with Flow (which syncs with jj under the hood).

Goal

Create a branch from latest origin/main (or preferred remote trunk), keep local state safe, and verify final state.

Recommended command flow

# 1) Start from repo root
cd <repo>

# 2) Sync trunk
f sync

# 3) Try Flow-native switch first
f switch <branch-name>

# 4) If Flow says "Branch '<name>' not found locally or on remotes", create from current HEAD
git switch -c <branch-name>

# 5) Verify branch, upstream, and base commit
git rev-parse --abbrev-ref HEAD
git for-each-ref --format='%(refname:short) %(upstream:short)' refs/heads/<branch-name>
git status --short --branch
git log -1 --oneline

# 6) Optional: publish branch and set tracking now
git push -u origin <branch-name>

Reusable AI context template

Paste this in requests when you want branch creation handled consistently:

Use Flow-native branch creation in this repo:
1. Run `f sync`.
2. Try `f switch <branch-name>`.
3. If Flow says branch is not found locally/remotely, run `git switch -c <branch-name>`.
4. Verify branch name, upstream/tracking, and clean working tree (`git status --short --branch`).
5. Report exact commands run, final branch, and HEAD commit.

Constraints:
- Keep unrelated local changes untouched.
- Do not use destructive git commands.
- If `f sync` is blocked by commit queue, list queue and clear stale entries safely before retrying.

Notes

  • f switch preserves safety snapshots and stashes by default.
  • f switch may create f-switch-save/<branch>-<timestamp> even when it fails to find the target branch; this is expected safety behavior.
  • f switch now searches all configured Git remotes (not just upstream/origin) when resolving a missing local branch.
  • Today, f switch may fail for a brand-new local-only branch name; use the documented fallback.
  • If you intentionally need a different base, switch to that base first, then run f switch <branch-name>.
  • If your default trunk is upstream/main, use --remote upstream.
  • If you plan to open a PR soon, run git push -u origin <branch-name> right after creation so tracking is set.