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
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(18 new commits). Files:lib/main.dartlib/screens/channel_chat_screen.dartlib/screens/map_screen.dartlib/theme/mesh_theme.dartlib/widgets/mesh_ui.dartlib/widgets/quick_switch_bar.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/44
Merge conflict with
upstream/dev(18 new commits). Files:lib/main.dartlib/screens/channel_chat_screen.dartlib/screens/map_screen.dartlib/theme/mesh_theme.dartlib/widgets/mesh_ui.dartlib/widgets/quick_switch_bar.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/45
Synced again in https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/46