Skip to content

Conversation

@linawolf
Copy link
Member

releases: main, 13.4

@linawolf
Copy link
Member Author

@rfay @mabolek fyi

Copy link
Contributor

@mabolek mabolek left a comment

Choose a reason for hiding this comment

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

Great improvement! I improved on the greatness and corrected some things too. 😃

linawolf and others added 2 commits April 26, 2025 13:28
Co-authored-by: Mathias Bolt Lesniak <git@mabolek.dev>
Co-authored-by: Mathias Bolt Lesniak <git@mabolek.dev>
@linawolf linawolf merged commit 80a1ebe into main Apr 26, 2025
10 checks passed
@linawolf linawolf deleted the task/root-page branch April 26, 2025 15:24
@github-actions
Copy link
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b4cbe21... [TASK] Improve "Create a root page" chapter
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging Documentation/FirstProject/CreateRootPage.rst
CONFLICT (content): Merge conflict in Documentation/FirstProject/CreateRootPage.rst

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-721-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b4cbe218d16f3ad6c3d0ac2775dab42df54f4413,eb41d03d34959c4f6881fbc10834192aecd55bda,21e4ac4d27047a3e956cabab21865c32ebf3d5a5
# Push it to GitHub
git push --set-upstream origin backport-721-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

Then, create a pull request where the base branch is 13.4 and the compare/head branch is backport-721-to-13.4.

linawolf added a commit that referenced this pull request Apr 26, 2025
* [TASK] Improve "Create a root page" chapter

releases: main, 13.4

* Apply suggestions from code review

Co-authored-by: Mathias Bolt Lesniak <git@mabolek.dev>

* Update Documentation/FirstProject/CreateRootPage.rst

Co-authored-by: Mathias Bolt Lesniak <git@mabolek.dev>

---------

Co-authored-by: Mathias Bolt Lesniak <git@mabolek.dev>

(cherry picked from commit 80a1ebe)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants