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

[CP #2022 > support/v5.13] [Doc] Fixed compile issue when compiling for the latest stable version #2023

Merged
merged 1 commit into from
Feb 13, 2025

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

Cherry-picked PR #2022 to branch support/v5.13.
The cherry-pick has failed.

The following files have caused conflicts:

doc/rst/conf.py

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/91a1454/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/91a1454/support/v5.13
git cherry-pick dc34b2d4f82f960005c6ee0504648bb12e5628e2..91a1454643451029eb76ad47d75241609eab7622

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/91a1454/support/v5.13

After resolving all conflicts, rebase-merge this PR.

@FlorianReimold FlorianReimold force-pushed the cherry-pick/91a1454/support/v5.13 branch from a52c0bc to 9dd0efc Compare February 13, 2025 05:56
@FlorianReimold FlorianReimold marked this pull request as ready for review February 13, 2025 06:04
@FlorianReimold FlorianReimold merged commit b9cf202 into support/v5.13 Feb 13, 2025
9 checks passed
FlorianReimold added a commit that referenced this pull request Feb 13, 2025
FlorianReimold added a commit that referenced this pull request Feb 13, 2025
* [Doc] Documentation now links to the release page #2021

- Documentation now links to the release page instead of building it
- PPA instructions are now built using Jinja2 (instead of empy)
- PPA instructions now specifically link to the appropriate eCAL Version
- Removed empy helpers entirely

* [Doc] Fixed compile issue when compiling for the latest stable version (#2022) (#2023)

Co-authored-by: Florian Reimold <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants