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/variant-encumbrance/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2024-05-24T12:24:53.242799Z",
    "action": 23,
    "target": "Rebasing (1/1)\nerror: could not apply 0e35c6f... Added translation using Weblate (Polish)\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 0e35c6f... Added translation using Weblate (Polish)\nAuto-merging src/module.json\nCONFLICT (content): Merge conflict in src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/pl.json\nAuto-merging src/languages/pl.json\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/1)\nerror: could not apply 0e35c6f... Added translation using Weblate (Polish)\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 0e35c6f... Added translation using Weblate (Polish)\nAuto-merging src/module.json\nCONFLICT (content): Merge conflict in src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/pl.json\nAuto-merging src/languages/pl.json\n (1)",
        "status": "interactive rebase in progress; onto 9a09a75\nLast command done (1 command done):\n   pick 0e35c6f Added translation using Weblate (Polish)\nNo commands remaining.\nYou are currently rebasing branch 'master' on '9a09a75'.\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\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/languages/pl.json\n\nUnmerged paths:\n  (use \"git restore --staged <file>...\" to unstage)\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   src/module.json\n\n"
    },
    "id": 461080,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/461080/?format=api"
}