GRIB: apply a heuristics to auto-fix wrong registration of latitudeOfFirstGridPoint in products from Tokyo center

[rouault]

No description provided.

[coveralls]

coverage: 70.074% (+0.002%) from 70.072%
when pulling d7d1f8b on rouault:grib2_japan_wrong_lcc
into 1646133 on OSGeo:master.

[rouault]

The backport to release/3.10 failed:

The process '/usr/bin/git' failed with exit code 1

stderr

error: could not apply d7d1f8b4dd... GRIB: apply a heuristics to auto-fix wrong registration of latitudeOfFirstGridPoint in products from Tokyo center
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 autotest/gdrivers/grib.py
Auto-merging frmts/grib/gribdataset.cpp
CONFLICT (modify/delete): port/cpl_known_config_options.h deleted in HEAD and modified in d7d1f8b4dd (GRIB: apply a heuristics to auto-fix wrong registration of latitudeOfFirstGridPoint in products from Tokyo center).  Version d7d1f8b4dd (GRIB: apply a heuristics to auto-fix wrong registration of latitudeOfFirstGridPoint in products from Tokyo center) of port/cpl_known_config_options.h left in tree.

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

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

[rouault]

too particular case / not worth the backport