Skip to content

Clarify upstream merge and Renovate actions on PRs#771

Merged
withinfocus merged 6 commits into
mainfrom
nomain
May 18, 2026
Merged

Clarify upstream merge and Renovate actions on PRs#771
withinfocus merged 6 commits into
mainfrom
nomain

Conversation

@withinfocus
Copy link
Copy Markdown
Contributor

@withinfocus withinfocus commented Feb 19, 2026

🎟️ Tracking

Internal discussions after seeing some Renovate activity.

📔 Objective

Adds guidance around not continually merging the upstream into Renovate branches given the effects and limitations, as well as in general.

@cloudflare-workers-and-pages
Copy link
Copy Markdown

cloudflare-workers-and-pages Bot commented Feb 19, 2026

Deploying contributing-docs with  Cloudflare Pages  Cloudflare Pages

Latest commit: de4725d
Status: ✅  Deploy successful!
Preview URL: https://70fed9dc.contributing-docs.pages.dev
Branch Preview URL: https://nomain.contributing-docs.pages.dev

View logs

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Feb 19, 2026

Logo
Checkmarx One – Scan Summary & Details779e0ec9-07b2-42e6-8386-f1e7388999c2

Great job! No new security vulnerabilities introduced in this pull request

@withinfocus withinfocus marked this pull request as ready for review February 19, 2026 20:35
@withinfocus withinfocus requested a review from a team as a code owner February 19, 2026 20:35
@withinfocus withinfocus changed the title Clarify Renovate actions on PRs Clarify upstream merge and Renovate actions on PRs Feb 19, 2026
Copy link
Copy Markdown
Member

@eliykat eliykat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't in the internal discussions, but some input from the tech lead perspective.

Comment thread docs/contributing/pull-requests/branching.md Outdated
Comment thread docs/contributing/pull-requests/branching.md Outdated
@withinfocus withinfocus added the ai-review Request a Claude code review label May 13, 2026
@withinfocus withinfocus reopened this May 13, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 13, 2026

🤖 Bitwarden Claude Code Review

Overall Assessment: APPROVE

This PR adds a new "Keeping your branch up to date" section to branching.md and rewrites the "Changing a generated PR" section in dependencies/index.md to clarify Renovate branch interaction. The two files are cross-linked, and the new dependencies content correctly defers to the new branching section for general guidance while documenting Renovate-specific behavior. The author has already incorporated reviewer feedback to present rebase and merge neutrally with the force-push tradeoff called out, and to clarify that CI on main (post-merge) is the safety net rather than pre-merge sync. Two earlier grammar suggestions have been resolved in the current diff.

Code Review Details

No new findings. Cross-link slug #keeping-your-branch-up-to-date resolves to the new heading, terminology is consistent with the rest of the file, and prior inline suggestions are reflected in the current text.

Comment thread docs/contributing/dependencies/index.md Outdated
Comment thread docs/contributing/dependencies/index.md
@withinfocus withinfocus requested a review from eliykat May 13, 2026 21:11
Copy link
Copy Markdown
Member

@eliykat eliykat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All my concerns have been addressed, thank you!

@withinfocus withinfocus merged commit d443296 into main May 18, 2026
14 checks passed
@withinfocus withinfocus deleted the nomain branch May 18, 2026 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-review Request a Claude code review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants