teckids/AlekSIS-App-Paweljong
9
0
Fork 0
Code Issues 24 Pull requests 17 Projects Releases Packages Wiki Activity Actions

WIP: Draft: Resolve "Use subgroups for activities" #223

Draft
yuha wants to merge 1 commit from 41-use-subgroups-for-activities into master
pull from: 41-use-subgroups-for-activities
merge into: teckids:master
Conversation 2 Commits 1 Files changed 12 +448 -3
yuha commented 2025-07-31 13:45:18 +02:00 (Migrated from edugit.org)
Copy link

Closes #41

Closes #41
yuha commented 2025-07-31 13:45:19 +02:00 (Migrated from edugit.org)
Copy link

assigned to @yuha

assigned to @yuha
yuha commented 2025-07-31 18:12:29 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>d75eee52 - WIP: Introduce activities</li></ul> [Compare with previous version](/Teckids/hacknfun/AlekSIS-App-Paweljong/-/merge_requests/102/diffs?diff_id=68553&start_sha=9d2755b9b2ec830f2bea268582c3f0cc98101c18)
This pull request has changes conflicting with the target branch.
  • aleksis/apps/paweljong/models.py
  • aleksis/apps/paweljong/preferences.py
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 41-use-subgroups-for-activities:41-use-subgroups-for-activities
git switch 41-use-subgroups-for-activities

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 41-use-subgroups-for-activities
git switch 41-use-subgroups-for-activities
git rebase master
git switch master
git merge --ff-only 41-use-subgroups-for-activities
git switch 41-use-subgroups-for-activities
git rebase master
git switch master
git merge --no-ff 41-use-subgroups-for-activities
git switch master
git merge --squash 41-use-subgroups-for-activities
git switch master
git merge --ff-only 41-use-subgroups-for-activities
git switch master
git merge 41-use-subgroups-for-activities
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Doing

   
To Do
No labels
Doing
To Do
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
yuha
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
teckids/AlekSIS-App-Paweljong!223
No description provided.