upstream-sync failed #29

Open
opened 2026-11-21 05:51:06 +01:00 by gitea-actions · 1 comment

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

  • lib/screens/channel_chat_screen.dart
  • lib/widgets/chat_composer.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/79

Merge conflict with `upstream/dev` (10 new commits). Files: - `lib/screens/channel_chat_screen.dart` - `lib/widgets/chat_composer.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/79

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

  • lib/screens/channel_chat_screen.dart
  • lib/widgets/chat_composer.dart
  • lib/widgets/mesh_ui.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/80

Merge conflict with `upstream/dev` (66 new commits). Files: - `lib/screens/channel_chat_screen.dart` - `lib/widgets/chat_composer.dart` - `lib/widgets/mesh_ui.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/80
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: tth-pub/meshcore-open#29