continuwuation/continuwuity
5
5
Fork 0
Code Issues 66 Pull requests 5 Projects Releases 15 Packages 1 Activity Actions

Rename admin room bot from conduit to conduwuit #695

Open
oddlid wants to merge 2 commits from oddlid/rename-admin-room-bot into main
pull from: oddlid/rename-admin-room-bot
merge into: continuwuation:main
Conversation 0 Commits 2 Files changed 2 +4 -4
oddlid commented 2025-03-05 02:55:25 +00:00 (Migrated from github.com)
Copy link
No description provided.
nex added the
Inherited
Priority
Unknown
 labels 2025-04-14 23:38:40 +00:00
This pull request has changes conflicting with the target branch.
  • flake.lock
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin oddlid/rename-admin-room-bot:oddlid/rename-admin-room-bot
git checkout oddlid/rename-admin-room-bot

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 checkout main
git merge --no-ff oddlid/rename-admin-room-bot
git checkout oddlid/rename-admin-room-bot
git rebase main
git checkout main
git merge --ff-only oddlid/rename-admin-room-bot
git checkout oddlid/rename-admin-room-bot
git rebase main
git checkout main
git merge --no-ff oddlid/rename-admin-room-bot
git checkout main
git merge --squash oddlid/rename-admin-room-bot
git checkout main
git merge --ff-only oddlid/rename-admin-room-bot
git checkout main
git merge oddlid/rename-admin-room-bot
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug

Something isn't working as intended

  
Cherry-picking

Commits picked from other conduit projects

  
Dependencies

Something dependency related

  
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

Additional eyes and keyboards are required for this one

  
Inherited

Issues that have been inhereted from the project pre-fork

  
Invalid

This issue doesn't seem right

  
Matrix/Administration

Features pertaining to homeserver administration

  
Matrix/Appservices

Features pertaining to the appservice API

  
Matrix/Auth

Features pertaining to authentication

  
Matrix/Client

Features pertaining to client-to-server interactions

  
Matrix/Federation

Features pertaining to server-to-server interactions

  
Matrix/MSC

Features pertaining to unstable matrix features

  
Matrix/Media

Features pertaining to media interactions

  
Meta

Related to housekeeping, maintenance, or other repo-meta.

  
Performance

Issues related to performance and related improvements

  
Priority
Critical
This issue is of the utmost priority

  
Priority
High
This issue is very important

  
Priority
Low
This issue is of a rather low priority

  
Priority
Medium
This issue is of a medium priority

  
Priority
Unknown
The priority of this issue has not been triaged yet, or cannot be appropriately decided.

  
Security

This item is related to general security

  
Wont fix

This will not be worked on

  
no-priority

   
old/blocked

Issue is blocked on another issue being completed

Archived

  
old/ci/cd

Ci/CD

Archived

  
old/core-matrix

Archived

  
old/database

Database things

Archived

  
old/github_actions

Issue/PR is from GitHub Actions

Archived

  
old/high-priority

Archived

  
old/low-priority

Archived

  
old/medium-priority

Archived

  
old/question

General questions

Archived

  
old/rocksdb

RocksDB database stuff

Archived

  
old/rust

Pull requests that update Rust code

Archived

  
packaging

Packaging

No labels
Bug
Cherry-picking
Dependencies
Documentation
Duplicate
Enhancement
Good first issue
Help wanted
Inherited
Invalid
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Federation
Matrix/MSC
Matrix/Media
Meta
Performance
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Priority
Unknown
Security
Wont fix
no-priority
old/blocked
old/ci/cd
old/core-matrix
old/database
old/github_actions
old/high-priority
old/low-priority
old/medium-priority
old/question
old/rocksdb
old/rust
packaging
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: continuwuation/continuwuity#695
No description provided.
Delete branch "oddlid/rename-admin-room-bot"

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?