{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/pf1/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-06-22T21:55:22.563325Z","action":23,"target":"Rebasing (1/1)\nerror: could not apply 8f5693234... i18n: Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 8f5693234... i18n: Translated using Weblate (German)\nAuto-merging lang/de.json\nCONFLICT (content): Merge conflict in lang/de.json\n (1)","old":"","details":{"error":"Rebasing (1/1)\nerror: could not apply 8f5693234... i18n: Translated using Weblate (German)\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 8f5693234... i18n: Translated using Weblate (German)\nAuto-merging lang/de.json\nCONFLICT (content): Merge conflict in lang/de.json\n (1)","status":"interactive rebase in progress; onto ee4564ed2\nLast command done (1 command done):\n   pick 8f5693234 i18n: Translated using Weblate (German)\nNo commands remaining.\nYou are currently rebasing branch 'master' on 'ee4564ed2'.\n  (fix conflicts and then run \"git rebase --continue\")\n  (use \"git rebase --skip\" to skip this patch)\n  (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n  (use \"git restore --staged <file>...\" to unstage)\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   lang/de.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"},"id":464455,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/464455/?format=json"}