{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/stream-view/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-06-18T00:38:59.301915Z","action":23,"target":"Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\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 ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)","old":"","details":{"error":"Rebasing (1/1)\nerror: could not apply ba99408... feat(translation): Added translation using Weblate (Polish)\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 ba99408... feat(translation): Added translation using Weblate (Polish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)","status":"interactive rebase in progress; onto 6fd6d02\nLast command done (1 command done):\n   pick ba99408 feat(translation): Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'develop' on '6fd6d02'.\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\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tnew file:   lang/pl.json\n\nUnmerged paths:\n  (use \"git restore --staged <file>...\" to unstage)\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   module.json\n\n"},"id":345675,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/345675/?format=json"}