mirror of
https://github.com/CopilotKit/CopilotKit.git
synced 2026-09-14 16:26:20 +08:00
09572f7a37
Commits should be grouped by area of concern when committing batches of changes, with related file moves included in the same commit.
1.3 KiB
1.3 KiB
Git & PRs
Worktree Workflow
Always use a git worktree for non-trivial work. This keeps the main working tree clean and lets you work in isolation.
- Start a worktree at the beginning of a task. This creates a new branch and a separate working directory.
- Do all work inside the worktree — commits, builds, tests.
- Push the worktree branch to the remote with
-uto set up tracking. - Create a PR targeting
mainusinggh pr create --base main. - Clean up the worktree after the PR is merged.
Creating a PR
When the work is ready:
- Stage and commit your changes in the worktree.
- Push the branch:
git push -u origin <branch-name> - Create the PR:
gh pr create --base main - Use a clear title (under 70 chars) and a body summarizing what changed and why.
Commit Conventions
- Write concise commit messages focused on the "why", not the "what".
- Stage specific files — avoid
git add -Aorgit add .to prevent accidentally including unrelated changes. - Never amend commits unless explicitly asked. Always create new commits.
- Never force-push unless explicitly asked.
- When committing a batch of changes, group commits by area of focus/purpose. Commits should be separated by area of concern. If modifications include related files being moved, group those with the associated changes.