Anri/cal7tor
1
0
Fork 0
forked from Anri/cal8tor
Code Issues 3 Pull requests 1 Releases 8 Activity

WIP: fix: correct display of the timetable #13

Draft
Anri wants to merge 4 commits from display-timetable into main
pull from: display-timetable
merge into: Anri:main
Conversation 0 Commits 4 Files changed 4 +32 -250
Anri commented 2024-10-01 17:10:06 +02:00
Owner
Copy link

Close #12

Close #12
Anri added 2 commits 2024-10-01 17:10:06 +02:00
Anri added 1 commit 2024-10-01 17:11:45 +02:00
Anri force-pushed display-timetable from 215a017df2 to 282177d1d6 2024-10-01 17:48:41 +02:00 Compare
Anri force-pushed display-timetable from 282177d1d6 to 8e18f7d2e5 2024-10-01 17:48:44 +02:00 Compare
Anri added 1 commit 2024-10-01 17:49:09 +02:00
Anri added 1 commit 2024-10-01 17:50:36 +02:00
Anri added 1 commit 2024-10-01 17:51:24 +02:00
Anri added 1 commit 2024-10-01 18:12:39 +02:00
Anri changed title from fix: correct display of the timetable to WIP: fix: correct display of the timetable 2024-10-01 18:12:51 +02:00
Anri added a new dependency 2024-10-08 16:45:33 +02:00
ConfrerieDuKassoulait/Botanique#194 - chore: merge branch dev to main
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin display-timetable:display-timetable
git checkout display-timetable

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 checkout main
git merge --no-ff display-timetable
git checkout display-timetable
git rebase main
git checkout main
git merge --ff-only display-timetable
git checkout display-timetable
git rebase main
git checkout main
git merge --no-ff display-timetable
git checkout main
git merge --squash display-timetable
git checkout main
git merge --ff-only display-timetable
git checkout main
git merge display-timetable
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: Anri/cal7tor#13
No description provided.
Delete branch "display-timetable"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?