Automatic sync could not merge block/buzz main (12023a3) into fork main (5cf2105).
Conflicting files:
.github/workflows/_ci-desktop.yml
desktop/src/features/channels/ui/MembersSidebar.tsx
desktop/src/features/channels/ui/MembersSidebarAddMemberRows.tsx
Resolve in any clone: git fetch upstream && git merge upstream/main, fix, push, close this issue.
Filed by the buzz-fork-sync launchd routine.
Automatic sync could not merge block/buzz main (12023a3) into fork main (5cf2105).
Conflicting files:
Resolve in any clone:
git fetch upstream && git merge upstream/main, fix, push, close this issue.Filed by the buzz-fork-sync launchd routine.