{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/terrain-ruler/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2022-10-21T13:24:19.336389Z","action":23,"target":"Rebasing (1/2)\nerror: could not apply 16d11df... Added translation using Weblate (Portuguese (Brazil) (pt-BR))\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 16d11df... Added translation using Weblate (Portuguese (Brazil) (pt-BR))\nCONFLICT (add/add): Merge conflict in lang/pt-BR.json\nAuto-merging lang/pt-BR.json\n (1)","old":"","details":{"error":"Rebasing (1/2)\nerror: could not apply 16d11df... Added translation using Weblate (Portuguese (Brazil) (pt-BR))\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 16d11df... Added translation using Weblate (Portuguese (Brazil) (pt-BR))\nCONFLICT (add/add): Merge conflict in lang/pt-BR.json\nAuto-merging lang/pt-BR.json\n (1)","status":"interactive rebase in progress; onto 5b68aa9\nLast command done (1 command done):\n   pick 16d11df Added translation using Weblate (Portuguese (Brazil) (pt-BR))\nNext command to do (1 remaining command):\n   pick fb49500 Translated using Weblate (Portuguese (Brazil) (pt-BR))\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'develop' on '5b68aa9'.\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/pt-BR.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"},"id":112296,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/112296/?format=json"}