upstream-sync failed #24

Closed
opened 2026-11-07 05:51:34 +01:00 by gitea-actions · 1 comment

Merge conflict with upstream/dev (9 new commits). Files:

  • lib/screens/channel_chat_screen.dart

Resolve locally: git fetch upstream && git merge upstream/dev on tth, push, and the next run carries on.

Run: https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/55

Merge conflict with `upstream/dev` (9 new commits). Files: - `lib/screens/channel_chat_screen.dart` Resolve locally: `git fetch upstream && git merge upstream/dev` on `tth`, push, and the next run carries on. Run: https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/55
Synced again in https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/56
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: tth-pub/meshcore-open#24