Skip to content

Conversation

ali90h
Copy link
Contributor

@ali90h ali90h commented Aug 26, 2025

Explain when to update (merge conflicts, upstream CI breakage, maintainer request) and when not to (already-green PRs under review).

Recommend incremental commits during review; prefer squash/rebase at the end when requested.

Mention git push --force-with-lease, a brief “what changed” note, and running local checks.

Addresses #2542

Test plan: mdbook build succeeds locally; visual check confirms the new guidance replaces the old prescriptive text.

@ali90h ali90h marked this pull request as ready for review August 26, 2025 07:52
@rustbot
Copy link
Collaborator

rustbot commented Aug 26, 2025

Thanks for the PR. If you have write access, feel free to merge this PR if it does not need reviews. You can request a review using r? rustc-dev-guide or r? <username>.

@rustbot rustbot added the S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content label Aug 26, 2025
@ali90h
Copy link
Contributor Author

ali90h commented Aug 26, 2025

r? rustc-dev-guide

@jieyouxu

This comment was marked as resolved.

@rustbot rustbot assigned jyn514 and unassigned jieyouxu Aug 26, 2025
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

thanks! I agree this is a good change. I have a few nits about wording if it's not too much of a hassle.

@ali90h ali90h force-pushed the clarify-keep-branch-up-to-date branch from 52e6214 to 27c7fef Compare August 26, 2025 16:32
@ali90h ali90h force-pushed the clarify-keep-branch-up-to-date branch from 27c7fef to d170192 Compare August 26, 2025 16:36
@ali90h ali90h requested a review from jyn514 August 26, 2025 16:42
@ali90h
Copy link
Contributor Author

ali90h commented Aug 26, 2025

thanks! I agree this is a good change. I have a few nits about wording if it's not too much of a hassle.

Thanks for your feedback🙏, it has been modified.

@jyn514 jyn514 merged commit 94f69b4 into rust-lang:master Aug 26, 2025
1 check passed
@rustbot rustbot removed the S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content label Aug 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants