upstream-sync failed #25

Closed
opened 2026-11-09 05:51:30 +01:00 by gitea-actions · 2 comments

Merge conflict with upstream/dev (5 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/59

Merge conflict with `upstream/dev` (5 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/59

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

  • android/app/src/main/kotlin/com/meshcore/meshcore_open/MainActivity.kt
  • lib/screens/app_settings_screen.dart
  • lib/screens/channel_chat_screen.dart
  • lib/widgets/chat_composer.dart
  • lib/widgets/mesh_nav_tile.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/60

Merge conflict with `upstream/dev` (19 new commits). Files: - `android/app/src/main/kotlin/com/meshcore/meshcore_open/MainActivity.kt` - `lib/screens/app_settings_screen.dart` - `lib/screens/channel_chat_screen.dart` - `lib/widgets/chat_composer.dart` - `lib/widgets/mesh_nav_tile.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/60
Synced again in https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/61
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: tth-pub/meshcore-open#25