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
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Merge conflict with
upstream/dev(42 new commits). Files:android/app/src/androidAuto/res/xml/unread_widget_info.xmlandroid/app/src/main/AndroidManifest.xmllib/screens/map_screen.dartResolve locally:
git fetch upstream && git merge upstream/devontth, 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.xmlandroid/app/src/main/AndroidManifest.xmllib/screens/map_screen.dartResolve locally:
git fetch upstream && git merge upstream/devontth, 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
Synced again in https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/21