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
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(5 new commits). Files:lib/screens/channel_chat_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/59
Merge conflict with
upstream/dev(19 new commits). Files:android/app/src/main/kotlin/com/meshcore/meshcore_open/MainActivity.ktlib/screens/app_settings_screen.dartlib/screens/channel_chat_screen.dartlib/widgets/chat_composer.dartlib/widgets/mesh_nav_tile.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/60
Synced again in https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/61