BlueGit

timfa questward

Files

questward / .cursor / rules / git-feature-branch-workflow.mdc

git-feature-branch-workflow.mdc

git tweak
timfa Tim Falken · pushed by timfa · 2 months ago
7121dc78 History
git-feature-branch-workflow.mdc 1.0 KiB Download Raw
1---
2description: Commit on feature branches after work; push means merge to master
3alwaysApply: true
4---
5
6# Git: commit as you go, push only when asked
7
8## After finishing a change set
9
10- Create or reuse a **feature branch** (do not leave finished work only on dirty `master`).
11- **Commit immediately** without asking for confirmation — prefer several small, focused commits over one dump.
12- Do **not** push unless the user asks.
13
14## When the user asks to push
15
16“Push” / “naar origin” means this sequence:
17
180. Run the **full** test suite: `npm test`. **Every test must pass.** Do not merge or push with failing tests — fix failures first (update outdated tests or remove obsolete one-offs; keep generic system coverage).
191. Merge the feature branch into `master` (never fast-forward).
202. Push `master` to `origin`.
213. Delete the local (and remote, if it existed) feature branch — it is obsolete after merge.
22
23Do not leave the finished work only on a remote feature branch unless the user explicitly wants a PR instead of merging to master.