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

Doc: fix issue with Unicode zero-width space character and PDF output #11166

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

rouault
Copy link
Member

@rouault rouault commented Oct 29, 2024

Fixes #11162

@rouault rouault added backport release/3.10 Backport to release/3.10 branch funded through GSP Work funded through the GDAL Sponsorship Program labels Oct 29, 2024
@rouault rouault merged commit e4effaf into OSGeo:master Oct 30, 2024
4 checks passed
@rouault
Copy link
Member Author

rouault commented Oct 30, 2024

cherry-picked to 3.10 per 7a55cf2 and efd3ed1

@rouault rouault added this to the 3.10.0 milestone Oct 30, 2024
@rouault rouault removed the backport release/3.10 Backport to release/3.10 branch label Oct 30, 2024
@rouault rouault deleted the fix_11162 branch October 30, 2024 11:30
@rouault
Copy link
Member Author

rouault commented Oct 30, 2024

The backport to release/3.10 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-11166-to-release/3.10
You are currently cherry-picking commit 289b9ea5df.
  (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-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-11166-to-release/3.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 289b9ea5dff283b911143a8b079c8dd39e2a78eb,38aaedb2fe372ccdbeeecf92581af5bb9a278ee1
# Push it to GitHub
git push --set-upstream origin backport-11166-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-11166-to-release/3.10.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
funded through GSP Work funded through the GDAL Sponsorship Program
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Doc: issue with Unicode zero-width space character and PDF output
1 participant