canonical / ubuntu-flutter-plugins

A collection of Flutter plugins and packages for Ubuntu applications.
46 stars 11 forks source link

fix: weblate merge conflict #422

Closed d-loose closed 2 months ago

d-loose commented 2 months ago

Weblate complains about the follwing

Rebasing (1/8)
dropping bb0ec11b7a22dcf106f0f124e12bf7522ed6e464 l10n: translated using Weblate (Danish) -- patch contents already upstream
Rebasing (2/8)
Auto-merging packages/ubuntu_localizations/lib/src/l10n/ubuntu_be.arb
CONFLICT (content): Merge conflict in packages/ubuntu_localizations/lib/src/l10n/ubuntu_be.arb
error: could not apply 0c0273e... l10n: translated using Weblate (Belarusian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 0c0273e... l10n: translated using Weblate (Belarusian)
 (1)

That's probably related to me trying to fix the Belarusian language code. The resulting diff is only a newline change though. Let's see if that helps appease weblate