ariasat/agecem-org
2
1
Fork 0
forked from agecem/agecem-org
Code Issues 24 Pull requests 3 Packages Activity Actions

WIP: ui page cms #82

Draft
ariasat wants to merge 3 commits from cms into main
pull from: cms
merge into: ariasat:main
Conversation 0 Commits 3 Files changed 9 +254 -4
ariasat commented 2026-07-30 12:56:54 -04:00
Owner
Copy link

closes #74

closes #74
feature: ui pour page de cms
All checks were successful
/ build (pull_request) Successful in 1m12s
Details
/ help (pull_request) Successful in -8s
Details
83148a143a
All checks were successful
/ build (pull_request) Successful in 1m12s
Details
/ help (pull_request) Successful in -8s
Details
This pull request has changes conflicting with the target branch.
  • frontend/public/components/general.html
  • frontend/public/components/header.html
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 cms:cms
git switch cms

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 cms
git switch cms
git rebase main
git switch main
git merge --ff-only cms
git switch cms
git rebase main
git switch main
git merge --no-ff cms
git switch main
git merge --squash cms
git switch main
git merge --ff-only cms
git switch main
git merge cms
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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
ariasat/agecem-org!82
No description provided.