First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Spanish)
Using index info to reconstruct a base tree...
M app/Locale/spa/LC_MESSAGES/default.po
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Added translation using Weblate (Turkish)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging app/Locale/tr/LC_MESSAGES/default.po
CONFLICT (add/add): Merge conflict in app/Locale/tr/LC_MESSAGES/default.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 Added translation using Weblate (Turkish)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
(1)
By unsubscribing from promotional emails, you agree to stop receiving notifications about available free VPN access and other news.
Promosyon e-postalarının aboneliğinden çıkarak, mevcut ücretsiz VPN erişimi ve diğer haberler hakkında bildirim almayı durdurmayı kabul etmiş olursunuz.
admin
Translate_Ceviri