upstream-sync failed #18

Closed
opened 2026-11-01 05:56:13 +01:00 by gitea-actions · 2 comments

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

  • lib/main.dart
  • lib/screens/channel_chat_screen.dart
  • lib/screens/map_screen.dart
  • lib/theme/mesh_theme.dart
  • lib/widgets/mesh_ui.dart
  • lib/widgets/quick_switch_bar.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/44

Merge conflict with `upstream/dev` (18 new commits). Files: - `lib/main.dart` - `lib/screens/channel_chat_screen.dart` - `lib/screens/map_screen.dart` - `lib/theme/mesh_theme.dart` - `lib/widgets/mesh_ui.dart` - `lib/widgets/quick_switch_bar.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/44

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

  • lib/main.dart
  • lib/screens/channel_chat_screen.dart
  • lib/screens/map_screen.dart
  • lib/theme/mesh_theme.dart
  • lib/widgets/mesh_ui.dart
  • lib/widgets/quick_switch_bar.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/45

Merge conflict with `upstream/dev` (18 new commits). Files: - `lib/main.dart` - `lib/screens/channel_chat_screen.dart` - `lib/screens/map_screen.dart` - `lib/theme/mesh_theme.dart` - `lib/widgets/mesh_ui.dart` - `lib/widgets/quick_switch_bar.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/45
Synced again in https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/46
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: tth-pub/meshcore-open#18