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

WIP: Draft: Resolve "Add view to customize global person profile" #167

Draft
nik wants to merge 1 commit from 53-add-view-to-customize-global-person-profile into master
pull from: 53-add-view-to-customize-global-person-profile
merge into: teckids:master
Conversation 1 Commits 1 Files changed 1 +2 -1
nik commented 2023-07-08 13:32:27 +02:00 (Migrated from edugit.org)
Copy link

Closes #53

Closes #53
nik commented 2023-07-08 14:09:12 +02:00 (Migrated from edugit.org)
Copy link

added 1 commit

  • 4444c972 - Update dependencies of COre and Kort to git versions for now

Compare with previous version

added 1 commit <ul><li>4444c972 - Update dependencies of COre and Kort to git versions for now</li></ul> [Compare with previous version](/Teckids/hacknfun/AlekSIS-App-Paweljong/-/merge_requests/46/diffs?diff_id=32383&start_sha=b516ded7fd2d7af8d1995bf006ac1cd0212bf891)
This pull request has changes conflicting with the target branch.
  • pyproject.toml
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 53-add-view-to-customize-global-person-profile:53-add-view-to-customize-global-person-profile
git switch 53-add-view-to-customize-global-person-profile

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 53-add-view-to-customize-global-person-profile
git switch 53-add-view-to-customize-global-person-profile
git rebase master
git switch master
git merge --ff-only 53-add-view-to-customize-global-person-profile
git switch 53-add-view-to-customize-global-person-profile
git rebase master
git switch master
git merge --no-ff 53-add-view-to-customize-global-person-profile
git switch master
git merge --squash 53-add-view-to-customize-global-person-profile
git switch master
git merge --ff-only 53-add-view-to-customize-global-person-profile
git switch master
git merge 53-add-view-to-customize-global-person-profile
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
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!167
No description provided.