Merge conflict with `upstream/dev` (2 new commits). Files:
- `lib/screens/repeater_settings_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/25
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(2 new commits). Files:lib/screens/repeater_settings_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/25
A step after the merge failed (tests or build), so nothing was pushed.
Run: https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/26
Synced again in https://git.rfa.cz/tth-pub/meshcore-open/actions/runs/27