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/pf2-fr/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2023-10-19T16:45:56.294830Z",
    "action": 23,
    "target": "Rebasing (1/2)\ndropping 03d4de50d7e3f422a37f1db67611314588424d03 Translated using Weblate (French) -- patch contents already upstream\nRebasing (2/2)\nerror: could not apply ecdf37f7c3... Translated 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 ecdf37f7c3... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/2)\ndropping 03d4de50d7e3f422a37f1db67611314588424d03 Translated using Weblate (French) -- patch contents already upstream\nRebasing (2/2)\nerror: could not apply ecdf37f7c3... Translated 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 ecdf37f7c3... Translated using Weblate (French)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\n (1)",
        "status": "interactive rebase in progress; onto a9a7607a86\nLast commands done (2 commands done):\n   pick 03d4de50d7 Translated using Weblate (French)\n   pick ecdf37f7c3 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'master' on 'a9a7607a86'.\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 modified:   lang/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
    },
    "id": 390759,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/390759/?format=api"
}