Sync changes from Meyblow/osu-oss #2

Open
Meyblow22 wants to merge 4 commits from meyblow22/github-sync-pr into master AGit
Member
No description provided.
Sync changes from Meyblow/osu-oss
Some checks failed
_diffcalc_processor.yml / Sync changes from Meyblow/osu-oss (pull_request) Failing after 0s
Continuous Integration / Code Quality (pull_request) Has been cancelled
Continuous Integration / Test (pull_request) Has been cancelled
Continuous Integration / Test-1 (pull_request) Has been cancelled
Continuous Integration / Test-2 (pull_request) Has been cancelled
Continuous Integration / Test-3 (pull_request) Has been cancelled
Continuous Integration / Test results (pull_request) Has been cancelled
Continuous Integration / Build only (Android) (pull_request) Has been cancelled
Continuous Integration / Build only (iOS) (pull_request) Has been cancelled
9b63aac274
Fix Forgejo workflow_call compatibility
Some checks failed
Continuous Integration / Code Quality (pull_request) Has been cancelled
Continuous Integration / Test (pull_request) Has been cancelled
Continuous Integration / Test-1 (pull_request) Has been cancelled
Continuous Integration / Test-2 (pull_request) Has been cancelled
Continuous Integration / Test-3 (pull_request) Has been cancelled
Continuous Integration / Test results (pull_request) Has been cancelled
Continuous Integration / Build only (Android) (pull_request) Has been cancelled
Continuous Integration / Build only (iOS) (pull_request) Has been cancelled
e4c48b542c
Meyblow22 force-pushed meyblow22/github-sync-pr from e4c48b542c
Some checks failed
Continuous Integration / Code Quality (pull_request) Has been cancelled
Continuous Integration / Test (pull_request) Has been cancelled
Continuous Integration / Test-1 (pull_request) Has been cancelled
Continuous Integration / Test-2 (pull_request) Has been cancelled
Continuous Integration / Test-3 (pull_request) Has been cancelled
Continuous Integration / Test results (pull_request) Has been cancelled
Continuous Integration / Build only (Android) (pull_request) Has been cancelled
Continuous Integration / Build only (iOS) (pull_request) Has been cancelled
to 851ecf6fb4
Some checks failed
Continuous Integration / Test (pull_request) Blocked by required conditions
Continuous Integration / Test-1 (pull_request) Blocked by required conditions
Continuous Integration / Test-2 (pull_request) Blocked by required conditions
Continuous Integration / Test-3 (pull_request) Blocked by required conditions
Continuous Integration / Test results (pull_request) Blocked by required conditions
Continuous Integration / Build only (Android) (pull_request) Blocked by required conditions
Continuous Integration / Build only (iOS) (pull_request) Blocked by required conditions
_diffcalc_processor.yml / feat(online): implement custom server subsystem, legacy profile and scores (pull_request) Failing after 0s
Continuous Integration / Code Quality (pull_request) Blocked by required conditions
2026-10-27 23:47:46 +03:00
Compare
Some checks failed
Continuous Integration / Test (pull_request) Blocked by required conditions
Continuous Integration / Test-1 (pull_request) Blocked by required conditions
Continuous Integration / Test-2 (pull_request) Blocked by required conditions
Continuous Integration / Test-3 (pull_request) Blocked by required conditions
Continuous Integration / Test results (pull_request) Blocked by required conditions
Continuous Integration / Build only (Android) (pull_request) Blocked by required conditions
Continuous Integration / Build only (iOS) (pull_request) Blocked by required conditions
_diffcalc_processor.yml / feat(online): implement custom server subsystem, legacy profile and scores (pull_request) Failing after 0s
Continuous Integration / Code Quality (pull_request) Blocked by required conditions
This pull request has changes conflicting with the target branch.
  • osu.Game.Auth/Loader.cs
  • osu.Game/Configuration/SpecialConfigManager.cs
  • osu.Game/OsuGameBase.cs
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 +refs/pull/2/head:meyblow22/github-sync-pr
git switch meyblow22/github-sync-pr

Merge

Merge the changes and update on Forgejo.
git switch master
git merge --no-ff meyblow22/github-sync-pr
git switch meyblow22/github-sync-pr
git rebase master
git switch master
git merge --ff-only meyblow22/github-sync-pr
git switch meyblow22/github-sync-pr
git rebase master
git switch master
git merge --no-ff meyblow22/github-sync-pr
git switch master
git merge --squash meyblow22/github-sync-pr
git switch master
git merge --ff-only meyblow22/github-sync-pr
git switch master
git merge meyblow22/github-sync-pr
git push origin master
Sign in to join this conversation.
No reviewers
No milestone
No project
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
RuJect/osu-oss!2
No description provided.