claude-code - 💡(How to fix) Fix Worktree code review panel diffs against main instead of the worktree's upstream branch [1 comments, 2 participants]

TL;DR

The code review panel should be configured to diff against the worktree's upstream/base branch instead of main.

Guidance

• Verify that the branch.<name>.merge and branch.<name>.vscode-merge-base configurations are correctly set to the feature branch for the worktree.
• Check if there are any other configuration settings that might be overriding the expected behavior, such as a global or user-level setting that defaults to diffing against main.
• Consider setting the vscode-merge-base configuration to the feature branch explicitly for the worktree, to ensure that the code review panel uses the correct base for the diff.
• Investigate if there's an option to configure the code review panel to use the worktree's upstream branch as the base for the diff, rather than relying on the vscode-merge-base setting.

Example

No code snippet is provided as it's not clearly supported by the issue.

Notes

The issue seems to be related to the configuration of the code review panel and the worktree's upstream branch. However, without more information about the specific tooling and configurations used, it's difficult to provide a more detailed solution.

Recommendation

Apply workaround: Configure the code review panel to use the worktree's upstream branch as the base for the diff, if possible, to avoid the incorrect diff against main. This should allow for a usable code review experience when working on worktrees based on feature branches.