MapServer / MapServer-documentation

Source repository for the MapServer documentation, for the live website. Please submit pull requests to the 'main' branch.
https://mapserver.org
Other
34 stars 69 forks source link

add CMake -DWITH_WFS note for OGCAPI Features #949

Closed jmckenna closed 3 months ago

jmckenna commented 3 months ago
github-actions[bot] commented 3 months ago

The backport to branch-8-2 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 ``` [backport-949-to-branch-8-2 624115d2] add CMake -DWITH_WFS not for OGCAPI Features Author: Jeff McKenna Date: Mon Jul 15 14:15:37 2024 -0300 1 file changed, 7 insertions(+), 3 deletions(-) On branch backport-949-to-branch-8-2 You are currently cherry-picking commit 406a82c7. (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-branch-8-2 branch-8-2
# Navigate to the new working tree
cd .worktrees/backport-branch-8-2
# Create a new branch
git switch --create backport-949-to-branch-8-2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick da7b83b12d0522c1e06471286b23244bd5963856,406a82c761c8fd95533c1cd6321d5621f7faa992,627d2a02918b4b2eca4d0f9fc4eb5ba46c829cab,2b3e060198c5fc4a27f6a32b2194e6fa8cae8edd
# Push it to GitHub
git push --set-upstream origin backport-949-to-branch-8-2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-8-2

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