jersey/lightning
5
40
Fork
You've already forked lightning
11

WIP: xmpp #187

Draft
jersey wants to merge 1 commit from xmpp into develop
pull from: xmpp
merge into: jersey:develop
jersey:develop
jersey:irc-debug-logging
jersey:fluxer-webhooks
jersey:mautrix-fork
jersey:pluralkit
No description provided.
This pull request has changes conflicting with the target branch.
  • go.mod
  • go.sum
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 xmpp:xmpp
git switch xmpp

Merge

Merge the changes and update on Forgejo.
git switch develop
git merge --no-ff xmpp
git switch xmpp
git rebase develop
git switch develop
git merge --ff-only xmpp
git switch xmpp
git rebase develop
git switch develop
git merge --no-ff xmpp
git switch develop
git merge --squash xmpp
git switch develop
git merge --ff-only xmpp
git switch develop
git merge xmpp
git push origin develop
Sign in to join this conversation.
No reviewers
Labels
Clear labels
scope
bolt
 anything specific to the hosted product offered as bolt
scope
bridge
 anything specific to the bridge application itself
scope
core
 anything affecting the main framework
scope
discord
 anything specific to the discord plugin
scope
epic
 something which requires a large set of changes (new platforms, new types of things to bridge, etc.)
scope
irc
scope
matrix
 anything specific to the matrix plugin
scope
osmium
scope
stoat
 anything specific to the stoat plugin
scope
telegran
 anything specific to the telegram plugin
status
blocked
 this is blocked due to something else
status
deferred
status
question
 further information is requested or a reproduction is needed
type
breaking
 this would change something in a public api
type
bug
 Something isn't working
type
build
 the docker images and related scripts i think
type
dependencies
 dependency-related things
type
documentation
 Improvements or additions to documentation
type
enhancement
 New feature or request
type
regression
 a bug introduced by an update
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
jersey/lightning!187
Reference in a new issue
jersey/lightning
No description provided.
Delete branch "xmpp"

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?