continuwuation/ruwuma
5
0
Fork 1
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

Changes to ruwuma required for Hydra #28

Open
nex wants to merge 10 commits from hydra/public into conduwuit-changes
pull from: hydra/public
merge into: continuwuation:conduwuit-changes
Conversation 0 Commits 10 Files changed 7 +68 -4
nex commented 2025-08-26 00:27:12 +00:00
Owner
Copy link
No description provided.
nex added 10 commits 2025-08-26 00:27:12 +00:00
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin hydra/public:hydra/public
git switch hydra/public

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 conduwuit-changes
git merge --no-ff hydra/public
git switch hydra/public
git rebase conduwuit-changes
git switch conduwuit-changes
git merge --ff-only hydra/public
git switch hydra/public
git rebase conduwuit-changes
git switch conduwuit-changes
git merge --no-ff hydra/public
git switch conduwuit-changes
git merge --squash hydra/public
git switch conduwuit-changes
git merge --ff-only hydra/public
git switch conduwuit-changes
git merge hydra/public
git push origin conduwuit-changes
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something isn't working

  
documentation

Improvements or additions to documentation

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
question

Further information is requested

  
wontfix

This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
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.

Blocks
#943 WIP: Implement room v12
continuwuation/continuwuity
Reference: continuwuation/ruwuma#28
No description provided.
Delete branch "hydra/public"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?