[llvm][docs] Add information about using GitHub's UI for updating a branch #166625
+10
−6
Conversation
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
lamb-j
reviewed
Nov 5, 2025
| you must use the pull request title and description as the commit message. | ||
| You can do this manually with an interactive git rebase or with GitHub's | ||
| built-in tool. See the section about landing your fix below. | ||
| If you create fix up or merge commits, you must squash and merge before |
Contributor
There was a problem hiding this comment.
Is it still possible to do a non-squashed merge? Maybe via the CLI?
Collaborator
There was a problem hiding this comment.
We still allow direct pushes to main, so maybe the CLI allows for pushing a non-squashed merge?
AaronBallman
approved these changes
Nov 6, 2025
| you must use the pull request title and description as the commit message. | ||
| You can do this manually with an interactive git rebase or with GitHub's | ||
| built-in tool. See the section about landing your fix below. | ||
| If you create fix up or merge commits, you must squash and merge before |
Collaborator
There was a problem hiding this comment.
We still allow direct pushes to main, so maybe the CLI allows for pushing a non-squashed merge?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
GitHub's Update Branch button is a helpful tool for quickly updating a PR before merging, but it might also be important to point out that it creates a merge commit without additional prompting, which may or may not be desired behavior for a given LLVM contributor.
Opened on the suggestion of @lamb-j