Skip to content

Conversation

rouault
Copy link
Member

@rouault rouault commented Oct 17, 2025

No description provided.

@rouault rouault added the backport release/3.11 Backport to release/3.11 branch label Oct 17, 2025
@rouault rouault merged commit 2375f42 into OSGeo:master Oct 17, 2025
37 of 39 checks passed
@rouault
Copy link
Member Author

rouault commented Oct 17, 2025

The backport to release/3.11 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b4b9609767... Pansharpening: make sure VRTPansharpenedRasterBand of overviews inherit the nodata value from the full res band
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 autotest/gdrivers/vrtpansharpen.py
Auto-merging frmts/vrt/vrtpansharpened.cpp
CONFLICT (content): Merge conflict in frmts/vrt/vrtpansharpened.cpp

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

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

@rouault
Copy link
Member Author

rouault commented Oct 17, 2025

cherry-picked to 3.11 per 44443bd

@rouault rouault added this to the 3.11.5 milestone Oct 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport release/3.11 Backport to release/3.11 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant