Skip to content

Align contributing worktree commands #460

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
codeforester wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Open

Align contributing worktree commands #460

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
11 changes: 9 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,22 @@ opinionated, testable, and useful as a shared workspace control plane.

```bash
git fetch origin master
git worktree add ../base-worktrees/<slug> -b <branch> origin/master
git worktree add -b <branch> ~/work/base-worktrees/<slug> origin/master
```

5. Keep the PR scoped to the issue. Avoid unrelated refactors.
6. Link the PR back to the issue with `Fixes #<issue>` or `Closes #<issue>`.
7. Use the standard PR body and fill in Summary, Issue, Validation, Demo
Impact, and Notes.
8. After merge, sync `master`, remove the worktree, and delete the local and
remote branches.
remote branches:

```bash
git -C ~/work/base pull --ff-only origin master
git -C ~/work/base worktree remove ~/work/base-worktrees/<slug>
git -C ~/work/base branch -d <branch>
git -C ~/work/base push origin --delete <branch>
```

For the full policy, including milestone and GitHub Project guidance, see
[GitHub Workflow](docs/github-workflow.md).
Expand Down
Loading