Change Instance

HTTP 200 OK
Allow: GET, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "unit": null,
    "component": "https://weblate.foundryvtt-hub.com/api/components/pf2e-hero-actions/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2023-06-19T11:16:45.129822Z",
    "action": 23,
    "target": "Rebasing (1/4)\nerror: could not apply 40a2511... 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 40a2511... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in lang/fr.json\nAuto-merging lang/fr.json\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/4)\nerror: could not apply 40a2511... 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 40a2511... Added translation using Weblate (French)\nAuto-merging module.json\nCONFLICT (add/add): Merge conflict in lang/fr.json\nAuto-merging lang/fr.json\n (1)",
        "status": "interactive rebase in progress; onto e776609\nLast command done (1 command done):\n   pick 40a2511 Added translation using Weblate (French)\nNext commands to do (3 remaining commands):\n   pick d80c03d Translated using Weblate (French)\n   pick d050e2c Added translation using Weblate (Portuguese (Brazil))\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'e776609'.\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\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
    },
    "id": 346840,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/346840/?format=api"
}