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/babonus/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2024-10-27T17:47:53.745794Z",
    "action": 23,
    "target": "Rebasing (1/1)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\nerror: could not apply 99a2569... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 99a2569... Translated using Weblate (French)\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/1)\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\nerror: could not apply 99a2569... Translated using Weblate (French)\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 99a2569... Translated using Weblate (French)\n (1)",
        "status": "interactive rebase in progress; onto b500821\nLast command done (1 command done):\n   pick 99a2569 Translated using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'b500821'.\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": 489431,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/489431/?format=api"
}