Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect docs #58108

Merged
merged 1 commit into from
Jul 21, 2024
Merged

Fix incorrect docs #58108

merged 1 commit into from
Jul 21, 2024

Conversation

nyalldawson
Copy link
Collaborator

No description provided.

Copy link

github-actions bot commented Jul 15, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit a38616a)

@nyalldawson nyalldawson merged commit bef93c5 into qgis:master Jul 21, 2024
29 checks passed
@nyalldawson nyalldawson deleted the transform_bounds branch July 21, 2024 21:14
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a38616a2cf7... Fix incorrect docs
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 advice.mergeConflict false"

stdout
Auto-merging python/PyQt6/core/auto_generated/qgsmaptopixel.sip.in
Auto-merging python/core/auto_generated/qgsmaptopixel.sip.in
Auto-merging src/core/qgsmaptopixel.h
CONFLICT (content): Merge conflict in src/core/qgsmaptopixel.h

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-release-3_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-58108-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a38616a2cf74319e415cd1083b2051f601a1d3a0
# Push it to GitHub
git push --set-upstream origin backport-58108-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

Then, create a pull request where the base branch is release-3_34 and the compare/head branch is backport-58108-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jul 21, 2024
@qgis-bot
Copy link
Collaborator

The backport to release-3_38 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a38616a2cf7... Fix incorrect docs
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 advice.mergeConflict false"

stdout
Auto-merging python/PyQt6/core/auto_generated/qgsmaptopixel.sip.in
Auto-merging python/core/auto_generated/qgsmaptopixel.sip.in
Auto-merging src/core/qgsmaptopixel.h
CONFLICT (content): Merge conflict in src/core/qgsmaptopixel.h

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-release-3_38 release-3_38
# Navigate to the new working tree
cd .worktrees/backport-release-3_38
# Create a new branch
git switch --create backport-58108-to-release-3_38
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a38616a2cf74319e415cd1083b2051f601a1d3a0
# Push it to GitHub
git push --set-upstream origin backport-58108-to-release-3_38
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_38

Then, create a pull request where the base branch is release-3_38 and the compare/head branch is backport-58108-to-release-3_38.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants