{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-09-15T18:57:35.335623Z","action":23,"target":"Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)","old":"","details":{"error":"Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)","status":"interactive rebase in progress; onto 09f521b\nLast command done (1 command done):\n   pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n   pick 325f731 Translated using Weblate (French)\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '09f521b'.\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:   languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"},"id":484497,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/484497/?format=json"}