added 1 commit <ul><li>97598f9b - WIP: Show course name in timetable overview</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/371/diffs?diff_id=47758&start_sha=50ba0341700f789d7489afcb0689819df9577da2)

This pull request has changes conflicting with the target branch.

aleksis/apps/chronos/models.py

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: Draft: Resolve "Show course name of lessons in the timetable"' (#675) from 221-show-course-name-of-lessons-in-the-timetable into master

Merge commit body

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-App-Chronos/pulls/675

Merge pull request 'WIP: Draft: Resolve "Show course name of lessons in the timetable"' (#675) from 221-show-course-name-of-lessons-in-the-timetable into master

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-App-Chronos/pulls/675

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 221-show-course-name-of-lessons-in-the-timetable:221-show-course-name-of-lessons-in-the-timetable

git switch 221-show-course-name-of-lessons-in-the-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 switch master

git merge --no-ff 221-show-course-name-of-lessons-in-the-timetable

git switch 221-show-course-name-of-lessons-in-the-timetable

git rebase master

git switch master

git merge --ff-only 221-show-course-name-of-lessons-in-the-timetable

git switch 221-show-course-name-of-lessons-in-the-timetable

git rebase master

git switch master

git merge --no-ff 221-show-course-name-of-lessons-in-the-timetable

git switch master

git merge --squash 221-show-course-name-of-lessons-in-the-timetable