git-workflow

Use the Conventional Commits format: a type like feat, fix, or ci, an optional scope, and an imperative lowercase subject under 72 characters. Write the body through git commit -F - with a quoted heredoc so zsh does not mangle backticks or dollar signs.

By default, leave the conflict to the auto-resolve workflow, which regenerates files and pushes the merge. Resolve by hand only when evidence shows the workflow will not act, such as a declined or handed-off mark, a missing consent label, or a stacked-child PR.

Zsh applies a colon history modifier to unbraced variables, so "$sha:refs/heads/x" loses characters after the colon. Brace the variable as "${sha}:refs/heads/x" or build the refspec with printf to avoid the parse.

No. This repository forbids amend, rebase, squash, force-push, and --no-verify. Fix any mistake, including a rejected commit message, with a new commit, and resolve conflicts only with merge commits.

Read the remerge-diff-report comment or run git show --remerge-diff with the merge driver override, then diff the merge against each parent. Watch for deletions the other parent made that the merge silently restored, and push corrections to the PR branch.

git stash push -u aborts on an unreadable sandbox path and a later pop can pull a foreign stash entry into your tree. Provision a detached worktree with git worktree add --detach instead to compare against HEAD safely.