gh-merge

# GitHub Merge GitHub is the development source of truth for this repository. Land changes through a GitHub pull request; do not create a GitLab merge request for product code. ## Workflow 1. Inspect repository state: ```bash git status --short --branch git branch --show-current git remote -v gh auth status --hostname github.com ``` 2. Identify the GitHub remote by URL instead of assuming a remote name. Resolve the target branch, normally `main`, and refuse to merge directly while checked out on that branch. 3. Review all dirty files. Stage only files belonging to the requested change; preserve unrelated user changes and never use `git add .`. Run the relevant local tests and `git diff --check`, then create a focused commit containing only the requested change. 4. Require a clean index and working tree before rebasing. If unrelated user changes remain, do not stash or move them automatically; use an already isolated checkout or stop and report what prevents a safe rebase. Once the checkout is clean, fetch and rebase on the current GitHub target: ```bash git fetch <github-remote> <target-branch> git rebase <github-remote>/<target-branch> ``` Resolve conflicts with user-owned work preserved, then rerun affected tests when the rebase changes the integration base. 5. Push the current branch. After a rebase, use `--force-with-lease`, never `--force`. 6. Reuse an existing pull request for the branch or create one...