Repository navigation
Conversation
The merge process page now describes using `git ubuntu deltarebase` which automates the whole merge. The former git ubuntu merge steps move to "Merge manually", the low-level reference for each deltarebase step.
s-makin
requested changes
Oct 15, 2026
s-makin
left a comment
s-makin
left a comment
Collaborator
There was a problem hiding this comment.
The RTD build is currently failing. Fixing the following two issues should let the build pass.
|
|
||
| Find the last import tag using {command}`git log`: | ||
| (merge-create-tags)= | ||
| #### Create the tags manually |
Collaborator
There was a problem hiding this comment.
The build is currently failing because of non-consecutive headers (h2 -> h4 in this case). You'll probably want to review and adjust all the header levels to make sure the sequence makes sense, but this one definitely should be a h3 level.
| (merge-split-commits)= | ||
| ## Split commits | ||
|
|
||
| Split changes in old-style {ref}`delta <merge-delta>` commits that grouped multiple changes together. |
Collaborator
There was a problem hiding this comment.
This reference doesn't exist, so it's also causing the docs to fail to build. Which section is it meant to be pointing to?
This branch has not been deployed
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.
The merge process page now describes using
git ubuntu deltarebasewhich automates the whole merge. The former git ubuntu merge steps move to "Merge manually", the low-level reference for each deltarebase step.