{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/playlist_import/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2022-12-12T09:29:19.856985Z","action":23,"target":"Rebasing (1/1)\nerror: could not apply 15c3a22... Translated using Weblate (Spanish)\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 15c3a22... Translated using Weblate (Spanish)\nAuto-merging src/languages/es.json\nCONFLICT (content): Merge conflict in src/languages/es.json\n (1)","old":"","details":{"error":"Rebasing (1/1)\nerror: could not apply 15c3a22... Translated using Weblate (Spanish)\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 15c3a22... Translated using Weblate (Spanish)\nAuto-merging src/languages/es.json\nCONFLICT (content): Merge conflict in src/languages/es.json\n (1)","status":"interactive rebase in progress; onto c4e0255\nLast command done (1 command done):\n   pick 15c3a22 Translated using Weblate (Spanish)\nNo commands remaining.\nYou are currently rebasing branch 'master' on 'c4e0255'.\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:   src/languages/es.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"},"id":172651,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/172651/?format=json"}