WIP: retrieve availability from catalog api #20

Draft
tobru wants to merge 1 commit from catalog-api into main
Owner
No description provided.
This pull request has changes conflicting with the target branch.
  • Dockerfile
  • docs/services/postgresql.md
  • zensical.toml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin catalog-api:catalog-api
git switch catalog-api

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff catalog-api
git switch catalog-api
git rebase main
git switch main
git merge --ff-only catalog-api
git switch catalog-api
git rebase main
git switch main
git merge --no-ff catalog-api
git switch main
git merge --squash catalog-api
git switch main
git merge --ff-only catalog-api
git switch main
git merge catalog-api
git push origin main
Sign in to join this conversation.
No reviewers
No milestone
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
servala/documentation!20
No description provided.