added 1 commit <ul><li>236bb7b9 - Add django-dbtemplates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/989/diffs?diff_id=19234&start_sha=622ad11b6d48ad53be0f58d6d861b724e2ff6f5d)

This pull request has changes conflicting with the target branch.

aleksis/core/settings.py
pyproject.toml

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 "Add template management"' (#2634) from 180-add-template-management into master

Merge commit body

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-Core/pulls/2634

Merge pull request 'WIP: Draft: Resolve "Add template management"' (#2634) from 180-add-template-management into master

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-Core/pulls/2634

Checkout

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

git fetch -u origin 180-add-template-management:180-add-template-management

git switch 180-add-template-management

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 180-add-template-management

git switch 180-add-template-management

git rebase master

git switch master

git merge --ff-only 180-add-template-management

git switch 180-add-template-management

git rebase master

git switch master

git merge --no-ff 180-add-template-management

git switch master

git merge --squash 180-add-template-management