finn/matrix-meshtastic-bridge
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages 1 Wiki Activity Actions

WIP: matrix session restore #4

Draft
finn wants to merge 2 commits from matrix-session-restore into main
pull from: matrix-session-restore
merge into: finn:main
Conversation 0 Commits 2 Files changed 10 +220 -56
finn commented 2024-10-17 07:13:31 +00:00
Owner
Copy link
No description provided.
finn added 2 commits 2024-10-17 07:13:32 +00:00
wip
Some checks failed
/ build-container (push) Failing after 3m51s
Details
b19cafc2b2
still failing 😭
Some checks failed
/ build-container (push) Failing after 4m36s
Details
3b9d40cd97
Some checks failed
/ build-container (push) Failing after 4m36s
Details
This pull request has changes conflicting with the target branch.
  • src/meshtastic.rs
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin matrix-session-restore:matrix-session-restore
git checkout matrix-session-restore

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 matrix-session-restore
git checkout matrix-session-restore
git rebase main
git checkout main
git merge --ff-only matrix-session-restore
git checkout matrix-session-restore
git rebase main
git checkout main
git merge --no-ff matrix-session-restore
git checkout main
git merge --squash matrix-session-restore
git checkout main
git merge --ff-only matrix-session-restore
git checkout main
git merge matrix-session-restore
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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: finn/matrix-meshtastic-bridge#4
No description provided.
Delete branch "matrix-session-restore"

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?