Conversation
Reviewer's guide (collapsed on small PRs)Reviewer's GuideDocuments a project-wide preference for using the Flow diagram for choosing jj vs git for VCS operationsflowchart TD
A_start["Start VCS_operation"] --> B_determine["Determine_operation_type"]
B_determine --> C_supported{Operation_supported_by_jj}
C_supported -- Yes --> D_use_jj["Use_jj_command"]
D_use_jj --> D1_inspect["For_inspection_use_jj_status_jj_diff_jj_log"]
D_use_jj --> D2_change["For_new_change_use_jj_new_and_jj_describe"]
D_use_jj --> D3_commit["For_commit_push_use_jj_commit_and_jj_push"]
D_use_jj --> D4_history["For_history_manipulation_use_jj_squash_jj_rebase_jj_edit"]
D1_inspect --> E_end["Operation_complete"]
D2_change --> E_end
D3_commit --> E_end
D4_history --> E_end
C_supported -- No --> F_use_git["Fallback_to_git_for_this_operation_only"]
F_use_git --> E_end
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
There was a problem hiding this comment.
Pull request overview
Updates the repository’s agent/developer guidance to prefer Jujutsu (jj) over git for version control operations, aligning VCS instructions in CLAUDE.md with the new workflow preference.
Changes:
- Add a “Version Control: Prefer jj” section to
CLAUDE.md. - Document common
jjcommands for inspection, starting changes, committing/pushing, and history edits. - Note a fallback to
gitfor unsupported operations.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
|
Warning Rate limit exceeded
⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- Consider briefly clarifying how to proceed in environments where
jjis not installed (e.g., whether it’s acceptable to fall back togitby default or whether installingjjis expected). - It may help future readers to add a short note that
jjoperates on the same underlying Git repository so they understand that usingjjwon’t break existing Git-based workflows.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Consider briefly clarifying how to proceed in environments where `jj` is not installed (e.g., whether it’s acceptable to fall back to `git` by default or whether installing `jj` is expected).
- It may help future readers to add a short note that `jj` operates on the same underlying Git repository so they understand that using `jj` won’t break existing Git-based workflows.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Greptile SummaryThis PR adds a "Version Control: Prefer jj" section to
Confidence Score: 4/5
|
| Filename | Overview |
|---|---|
| CLAUDE.md | Adds a "Version Control: Prefer jj" section instructing agents to use Jujutsu (jj) over git. The guidance is mostly correct but omits the jj bookmark create step required for GitHub PR branch creation, which could cause jj push to silently push nothing for new branches. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart TD
A[Start new change] --> B["jj new <parent>"]
B --> C[Make code edits]
C --> D["jj describe -m 'type(scope): msg'"]
D --> E{Pushing to GitHub?}
E -- Yes --> F["jj bookmark create <branch-name>"]
F --> G["jj push --bookmark <branch-name>"]
E -- No / already has bookmark --> H["jj push"]
G --> I[Open PR on GitHub]
H --> I
D --> J[History manipulation]
J --> K["jj squash / jj rebase / jj edit"]
K --> E
E -- Unsupported operation --> L["Fall back to git"]
Last reviewed commit: c0433c7
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
| Use `jj` (Jujutsu) for all VCS operations instead of `git`: | ||
| - `jj status`, `jj diff`, `jj log` for inspection | ||
| - `jj new` to start a change, `jj describe` to set the message | ||
| - `jj commit` to commit, `jj push` to push |
There was a problem hiding this comment.
Missing bookmark creation step for GitHub PR workflows
In jj, pushing to a new remote branch for a GitHub PR requires creating a named bookmark first. Without it, jj push pushes all existing tracked bookmarks but does nothing for an untracked change — agents will silently fail to open a PR without falling back to git.
A typical PR workflow should include:
jj new main # start a change on top of main
# ... make edits ...
jj describe -m "feat(scope): message"
jj bookmark create my-feature # required before pushing a new branch
jj push --bookmark my-feature # push that specific bookmark
Consider adding a note like:
Suggested change
| - `jj commit` to commit, `jj push` to push | |
| - `jj commit` to commit, `jj push --bookmark <name>` to push (create bookmark first with `jj bookmark create <name>`) |
Prompt To Fix With AI
This is a comment left during a code review.
Path: CLAUDE.md
Line: 30
Comment:
**Missing bookmark creation step for GitHub PR workflows**
In `jj`, pushing to a new remote branch for a GitHub PR requires creating a named *bookmark* first. Without it, `jj push` pushes all existing tracked bookmarks but does **nothing** for an untracked change — agents will silently fail to open a PR without falling back to `git`.
A typical PR workflow should include:
```
jj new main # start a change on top of main
# ... make edits ...
jj describe -m "feat(scope): message"
jj bookmark create my-feature # required before pushing a new branch
jj push --bookmark my-feature # push that specific bookmark
```
Consider adding a note like:
```suggestion
- `jj commit` to commit, `jj push --bookmark <name>` to push (create bookmark first with `jj bookmark create <name>`)
```
How can I resolve this? If you propose a fix, please make it concise.
Coverage Report
File CoverageNo changed files found. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds jj (Jujutsu) preference rule to CLAUDE.md so agents use jj instead of git.
Summary by Sourcery
Documentation: