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/stairways/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2022-10-31T17:39:54.207811Z",
    "action": 23,
    "target": "Rebasing (1/1)\nerror: could not apply c0c0ac7... 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 c0c0ac7... 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/1)\nerror: could not apply c0c0ac7... 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 c0c0ac7... 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 20db96d\nLast command done (1 command done):\n   pick c0c0ac7 Added translation using Weblate (French)\nNo commands remaining.\nYou are currently rebasing branch 'main' on '20db96d'.\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": 115905,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/115905/?format=api"
}