nether/vommet
nether/vommet
Watch
3
0
Fork
You've already forked vommet
 0
Code Issues 45 Pull requests Projects Releases 3 Packages Activity Actions 5

Upstream sync 2026-10-05: conflict #47

New issue
Closed
opened 2026-10-05 22:04:52 +00:00 by robocub · 2 comments
robocub commented 2026-10-05 22:04:52 +00:00
Member
Copy link

Upstream sync: 0 new upstream commit(s)

Upstream main 51d5e3e8 → 51d5e3e8 (2026-10-05)

Branches

branch commits
main 14 rebased onto upstream
chore/branding 8 on main
chore/fork-settings 1 on main
ci/version-label 2 on main
ci/android-apk 8 on main
ci/flatpak 8 on main
feat/room-picker-search 1 on main
feat/telegram-sticker-import 2 on main
feat/room-banners 1 on main
feat/desktop-copy-selection 1 on main
feat/media-mosaic 2 on feat/desktop-copy-selection
feat/space-remove-room 1 on main
feat/voice-messages 2 on main

❌ Conflict while rebuilding feat/personal-packs

At commit: a2a11fb2 feat: import into an existing pack or a new one; more than one personal pack (#19)

Conflicting files:

  • VOMMET_CHANGES.md

Resolve it by hand (rebase the branch onto its new parent, fix, push) and run the sync again.

Run: https://nether.codes/robocub/vommet/actions/runs/140

# Upstream sync: 0 new upstream commit(s) Upstream `main` 51d5e3e8 → 51d5e3e8 (2026-10-05) ## Branches | branch | commits | | |---|---|---| | main | 14 | rebased onto upstream | | chore/branding | 8 | on main | | chore/fork-settings | 1 | on main | | ci/version-label | 2 | on main | | ci/android-apk | 8 | on main | | ci/flatpak | 8 | on main | | feat/room-picker-search | 1 | on main | | feat/telegram-sticker-import | 2 | on main | | feat/room-banners | 1 | on main | | feat/desktop-copy-selection | 1 | on main | | feat/media-mosaic | 2 | on feat/desktop-copy-selection | | feat/space-remove-room | 1 | on main | | feat/voice-messages | 2 | on main | ## ❌ Conflict while rebuilding `feat/personal-packs` At commit: `a2a11fb2 feat: import into an existing pack or a new one; more than one personal pack (#19)` Conflicting files: - `VOMMET_CHANGES.md` Resolve it by hand (rebase the branch onto its new parent, fix, push) and run the sync again. Run: https://nether.codes/robocub/vommet/actions/runs/140
robocub commented 2026-10-05 22:15:30 +00:00
Author
Member
Copy link

Upstream sync: 0 new upstream commit(s)

Upstream main 51d5e3e8 → 51d5e3e8 (2026-10-05)

Branches

branch commits
main 15 rebased onto upstream
chore/branding 8 on main
chore/fork-settings 1 on main
ci/version-label 2 on main
ci/android-apk 8 on main
ci/flatpak 8 on main
feat/room-picker-search 1 on main
feat/telegram-sticker-import 2 on main
feat/room-banners 1 on main
feat/desktop-copy-selection 1 on main
feat/media-mosaic 2 on feat/desktop-copy-selection
feat/space-remove-room 1 on main
feat/voice-messages 2 on main
feat/personal-packs 4 on feat/telegram-sticker-import
fix/own-push-gateway 1 on main
ci/fork-invariants 1 on ci/version-label
fix/linux-app-id 1 on main
feat/sso-first-login 2 on main
feat/gradient-themes 1 on main

Candidates: sync/main d0c8a67f, sync/testing 6af13792.
Promote with the upstream-promote workflow once CI is green on both.

Run: https://nether.codes/robocub/vommet/actions/runs/142

# Upstream sync: 0 new upstream commit(s) Upstream `main` 51d5e3e8 → 51d5e3e8 (2026-10-05) ## Branches | branch | commits | | |---|---|---| | main | 15 | rebased onto upstream | | chore/branding | 8 | on main | | chore/fork-settings | 1 | on main | | ci/version-label | 2 | on main | | ci/android-apk | 8 | on main | | ci/flatpak | 8 | on main | | feat/room-picker-search | 1 | on main | | feat/telegram-sticker-import | 2 | on main | | feat/room-banners | 1 | on main | | feat/desktop-copy-selection | 1 | on main | | feat/media-mosaic | 2 | on feat/desktop-copy-selection | | feat/space-remove-room | 1 | on main | | feat/voice-messages | 2 | on main | | feat/personal-packs | 4 | on feat/telegram-sticker-import | | fix/own-push-gateway | 1 | on main | | ci/fork-invariants | 1 | on ci/version-label | | fix/linux-app-id | 1 | on main | | feat/sso-first-login | 2 | on main | | feat/gradient-themes | 1 | on main | Candidates: `sync/main` d0c8a67f, `sync/testing` 6af13792. Promote with the **upstream-promote** workflow once CI is green on both. Run: https://nether.codes/robocub/vommet/actions/runs/142
robocub commented 2026-10-05 23:05:23 +00:00
Author
Member
Copy link

Promoted: main, the topics and testing now point at the candidates. Rollback tags: pre-sync/20261005-230516/*.

Run: https://nether.codes/robocub/vommet/actions/runs/148

Promoted: main, the topics and testing now point at the candidates. Rollback tags: `pre-sync/20261005-230516/*`. Run: https://nether.codes/robocub/vommet/actions/runs/148
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
chore/register-discover
feat/discover
fix/notification-fallback
testing
ci/android-apk
ci/flatpak
ci/fork-invariants
feat/desktop-copy-selection
feat/gradient-themes
feat/media-mosaic
feat/personal-packs
feat/room-banners
feat/room-picker-search
feat/space-remove-room
feat/sso-first-login
feat/telegram-sticker-import
feat/voice-messages
fix/linux-app-id
fix/own-push-gateway
chore/branding
chore/fork-settings
ci/version-label
chore/register-gradient-themes
ci/integration-tests
design/logo
bootstrap
keybinder
update-emoji
fix-url-previews
fix-flatpak
test-color-scheme-generation
widget-reliability
custom-themes
livekit-rust
test-disabled-notification-counts
stutter-test
improved-link-handling
platform/ios
rich-notifications-linux
fix/gif-search-input
test/voip-data-channel
pre-sync/20261005-230516/main
testing-2026-10-05c
pre-sync/20261005-230516/feat/gradient-themes
pre-sync/20261005-230516/testing
pre-sync/20261005-230516/ci/flatpak
pre-sync/20261005-230516/feat/desktop-copy-selection
pre-sync/20261005-230516/ci/fork-invariants
pre-sync/20261005-230516/fix/own-push-gateway
pre-sync/20261005-230516/fix/linux-app-id
pre-sync/20261005-230516/feat/personal-packs
pre-sync/20261005-230516/feat/media-mosaic
pre-sync/20261005-230516/feat/voice-messages
pre-sync/20261005-230516/feat/sso-first-login
pre-sync/20261005-230516/feat/space-remove-room
pre-sync/20261005-230516/feat/room-banners
pre-sync/20261005-230516/feat/room-picker-search
pre-sync/20261005-230516/feat/telegram-sticker-import
pre-sync/20261005-230516/chore/fork-settings
pre-sync/20261005-230516/ci/android-apk
pre-sync/20261005-230516/chore/branding
pre-sync/20261005-230516/ci/version-label
pre-sync/20261005-210511/main
pre-sync/20261005-210511/ci/fork-invariants
pre-sync/20261005-210511/testing
pre-sync/20261005-210511/feat/voice-messages
pre-sync/20261005-210511/feat/sso-first-login
pre-sync/20261005-210511/fix/linux-app-id
pre-sync/20261005-210511/ci/flatpak
pre-sync/20261005-210511/fix/own-push-gateway
testing-2026-10-05b
pre-sync/20261005-210511/ci/version-label
pre-sync/20261005-210511/ci/android-apk
pre-sync/20261005-210511/feat/media-mosaic
pre-sync/20261005-210511/chore/branding
pre-restack/ci/version-label
pre-restack/ci/flatpak
pre-sync/20261005-210511/feat/personal-packs
pre-restack/chore/branding
pre-sync/20261005-210511/chore/fork-settings
testing-2026-10-05
pre-sync/20261005-210511/feat/space-remove-room
pre-restack/feat/media-mosaic
pre-sync/20261005-210511/feat/telegram-sticker-import
pre-sync/20261005-210511/feat/desktop-copy-selection
pre-sync/20261005-210511/feat/room-banners
pre-sync/20261005-210511/feat/room-picker-search
v0.5.0
v0.4.2+hotfix.2
v0.4.2+hotfix.1
v0.4.2
v0.4.1
v0.4.0
v0.4.0-prerelease+20251025
v0.4.0-prerelease+20250924
v0.3.1+hotfix.1
v0.3.1
v0.3.1-prerelease+20250316
v0.3.1-prerelease+952499f
v0.3.1-prerelease+ee5f1b6
v0.3.0
v0.3.0-prerelease+2973942
v0.3.0-prerelease+92b5735
v0.3.0-prerelease+dd1dadf
v0.3.0-prerelease+d89fea2
v0.3.0-prerelease+5c8379c
v0.2.1
v0.2.0
v0.1.4
v0.1.3
v0.1.2
v0.1.1
v0.1.0
Labels
Clear labels   
bug
Something is broken

  
effort: large
Multi-week or multi-repo

  
effort: medium
A week or two

  
effort: small
Days

  
feature
New capability

  
infra
Proxy, CI, packaging, releases

  
needs-info
Blocked on logs, repro steps or a decision

  
upstream
Imported from Commet's GitHub tracker; drop our patch once upstream fixes it

  
ux
Papercuts and usability

  
voice
Calls, voice and screen share

No labels
bug
effort: large
effort: medium
effort: small
feature
infra
needs-info
upstream
ux
voice
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
nether/vommet#47
No description provided.