Skip to content

update for 8.6.4 release [build_translations]#1086

Merged
jmckenna merged 6 commits into
MapServer:mainfrom
jmckenna:main
Jun 2, 2026
Merged

update for 8.6.4 release [build_translations]#1086
jmckenna merged 6 commits into
MapServer:mainfrom
jmckenna:main

Conversation

@jmckenna
Copy link
Copy Markdown
Member

@jmckenna jmckenna commented Jun 1, 2026

No description provided.

@jmckenna jmckenna added Work in progress Not ready for merging yet backport branch-8-6 (live) To backport a pull request to branch-8-6 labels Jun 1, 2026
@jmckenna jmckenna changed the title update for 8.6.4 release {build_translations] update for 8.6.4 release [build_translations] Jun 1, 2026
@jmckenna jmckenna removed the Work in progress Not ready for merging yet label Jun 2, 2026
@jmckenna jmckenna merged commit 16f791b into MapServer:main Jun 2, 2026
3 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 2, 2026

The backport to branch-8-6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1f8f741b... update for 8.6.3 release [build_translations]
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 en/development/changelog/changelog-8-6.txt
CONFLICT (content): Merge conflict in en/development/changelog/changelog-8-6.txt

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-branch-8-6 branch-8-6
# Navigate to the new working tree
cd .worktrees/backport-branch-8-6
# Create a new branch
git switch --create backport-1086-to-branch-8-6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1f8f741b66c7aa45809d59d34e0ed9418a42cbd2,ed1b0b07210bf572c1124757d276d4a2ce342d76,5fbe773ec2861de7fb171f3a6ba4a2f5575bc3c0,45899da13e390896a2831267abd37bd375e9e03a,e91629068af7dd4046a01427441f3003fe18556d,b54e22d7c74949b4900a27908c82b122ecca71d2
# Push it to GitHub
git push --set-upstream origin backport-1086-to-branch-8-6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-8-6

Then, create a pull request where the base branch is branch-8-6 and the compare/head branch is backport-1086-to-branch-8-6.

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

Labels

backport branch-8-6 (live) To backport a pull request to branch-8-6 failed backport

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant