{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/visual-active-effects/main/?format=json","translation":null,"user":"https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=json","author":null,"timestamp":"2024-02-22T08:57:34.202937Z","action":23,"target":"Rebasing (1/1)\nerror: could not apply b4c687c... Added translation 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 b4c687c... Added translation using Weblate (Spanish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)","old":"","details":{"error":"Rebasing (1/1)\nerror: could not apply b4c687c... Added translation 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 b4c687c... Added translation using Weblate (Spanish)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\n (1)","status":"interactive rebase in progress; onto f6b6c67\nLast command done (1 command done):\n   pick b4c687c Added translation using Weblate (Spanish)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'f6b6c67'.\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/es.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":442872,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/442872/?format=json"}