upstream-sync failed #1

Closed
opened 2026-10-25 05:51:11 +01:00 by gitea-actions · 3 comments

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

  • android/app/src/androidAuto/res/xml/unread_widget_info.xml
  • android/app/src/main/AndroidManifest.xml
  • lib/screens/map_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/17

Merge conflict with `upstream/dev` (42 new commits). Files: - `android/app/src/androidAuto/res/xml/unread_widget_info.xml` - `android/app/src/main/AndroidManifest.xml` - `lib/screens/map_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/17

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

  • android/app/src/androidAuto/res/xml/unread_widget_info.xml
  • android/app/src/main/AndroidManifest.xml
  • lib/screens/map_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/18

Merge conflict with `upstream/dev` (66 new commits). Files: - `android/app/src/androidAuto/res/xml/unread_widget_info.xml` - `android/app/src/main/AndroidManifest.xml` - `lib/screens/map_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/18

A step after the merge failed (tests or build), so nothing was pushed.

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

A step after the merge failed (tests or build), so nothing was pushed. Run: https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/19
Synced again in https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/21
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: tth-pub/meshcore-open#1