{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/pf2e-giveth/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-03-07T14:09:17.262231Z","action":23,"target":"Rebasing (1/6)\nerror: could not apply 557ff3f... Added translation 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 557ff3f... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nCONFLICT (add/add): Merge conflict in lang/fr.json\nAuto-merging lang/fr.json\n (1)","old":"","details":{"error":"Rebasing (1/6)\nerror: could not apply 557ff3f... Added translation 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 557ff3f... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (content): Merge conflict in module.json\nCONFLICT (add/add): Merge conflict in lang/fr.json\nAuto-merging lang/fr.json\n (1)","status":"interactive rebase in progress; onto 431570b\nLast command done (1 command done):\n   pick 557ff3f Added translation using Weblate (French)\nNext commands to do (5 remaining commands):\n   pick 99a3dda Translated using Weblate (French)\n   pick 462cf43 Added translation using Weblate (Russian)\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '431570b'.\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 added:      lang/fr.json\n\tboth modified:   module.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"},"id":262682,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/262682/?format=json"}