Skip to content

Correction in docs for airocean#4798

Merged
kbevers merged 1 commit into
OSGeo:9.8from
brsr:patch-1
Jul 3, 2026
Merged

Correction in docs for airocean#4798
kbevers merged 1 commit into
OSGeo:9.8from
brsr:patch-1

Conversation

@brsr

@brsr brsr commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

As per Gray 1995 (cited in the docs), this is not an equal-area projection.

As per Gray 1995, this is not an equal-area projection.
@kbevers kbevers added the backport 9.8 Backport to 9.8 branch label Jul 3, 2026
@kbevers kbevers merged commit 7cea5f4 into OSGeo:9.8 Jul 3, 2026
5 checks passed
@rouault

rouault commented Jul 3, 2026

Copy link
Copy Markdown
Member

The backport to 9.8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
On branch backport-4798-to-9.8
You are currently cherry-picking commit 5d055e13.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 9.8 Backport to 9.8 branch failed backport

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants