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-animations/master/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2024-06-28T15:29:50.054139Z",
    "action": 23,
    "target": "Rebasing (1/1)\nwarning: Cannot merge binary files: packs/actors/MANIFEST-000535 (HEAD:packs/actors/MANIFEST-000535 vs. 1f4e120 (Fix #166):packs/actors/MANIFEST-000475)\nwarning: Cannot merge binary files: packs/actors/LOG.old (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actors/LOG (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actors/CURRENT (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actions/LOG.old (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actions/LOG (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actions/CURRENT (HEAD vs. 1f4e120 (Fix #166))\nerror: could not apply 1f4e120... Fix #166\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 1f4e120... Fix #166\nCONFLICT (modify/delete): packs/macros/LOG.old deleted in HEAD and modified in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/macros/LOG.old left in tree.\nCONFLICT (modify/delete): packs/macros/LOG deleted in HEAD and modified in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/macros/LOG left in tree.\nCONFLICT (modify/delete): packs/macros/CURRENT deleted in HEAD and modified in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/macros/CURRENT left in tree.\nCONFLICT (rename/delete): packs/macros/000499.ldb deleted in HEAD and renamed to packs/macros/000504.ldb in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/macros/000504.ldb left in tree.\nCONFLICT (rename/rename): Rename \"packs/actors/MANIFEST-000471\"->\"packs/actors/MANIFEST-000535\" in branch \"HEAD\" rename \"packs/actors/MANIFEST-000471\"->\"packs/actors/MANIFEST-000475\" in \"1f4e120 (Fix #166)\"\nAuto-merging packs/actors/MANIFEST-000535 and packs/actors/MANIFEST-000475, both renamed from packs/actors/MANIFEST-000471\nAuto-merging packs/actors/LOG.old\nCONFLICT (content): Merge conflict in packs/actors/LOG.old\nAuto-merging packs/actors/LOG\nCONFLICT (content): Merge conflict in packs/actors/LOG\nAuto-merging packs/actors/CURRENT\nCONFLICT (content): Merge conflict in packs/actors/CURRENT\nCONFLICT (rename/delete): packs/actions/MANIFEST-000471 deleted in HEAD and renamed to packs/actions/MANIFEST-000475 in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/actions/MANIFEST-000475 left in tree.\nAuto-merging packs/actions/LOG.old\nCONFLICT (content): Merge conflict in packs/actions/LOG.old\nAuto-merging packs/actions/LOG\nCONFLICT (content): Merge conflict in packs/actions/LOG\nAuto-merging packs/actions/CURRENT\nCONFLICT (content): Merge conflict in packs/actions/CURRENT\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/1)\nwarning: Cannot merge binary files: packs/actors/MANIFEST-000535 (HEAD:packs/actors/MANIFEST-000535 vs. 1f4e120 (Fix #166):packs/actors/MANIFEST-000475)\nwarning: Cannot merge binary files: packs/actors/LOG.old (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actors/LOG (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actors/CURRENT (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actions/LOG.old (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actions/LOG (HEAD vs. 1f4e120 (Fix #166))\nwarning: Cannot merge binary files: packs/actions/CURRENT (HEAD vs. 1f4e120 (Fix #166))\nerror: could not apply 1f4e120... Fix #166\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 1f4e120... Fix #166\nCONFLICT (modify/delete): packs/macros/LOG.old deleted in HEAD and modified in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/macros/LOG.old left in tree.\nCONFLICT (modify/delete): packs/macros/LOG deleted in HEAD and modified in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/macros/LOG left in tree.\nCONFLICT (modify/delete): packs/macros/CURRENT deleted in HEAD and modified in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/macros/CURRENT left in tree.\nCONFLICT (rename/delete): packs/macros/000499.ldb deleted in HEAD and renamed to packs/macros/000504.ldb in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/macros/000504.ldb left in tree.\nCONFLICT (rename/rename): Rename \"packs/actors/MANIFEST-000471\"->\"packs/actors/MANIFEST-000535\" in branch \"HEAD\" rename \"packs/actors/MANIFEST-000471\"->\"packs/actors/MANIFEST-000475\" in \"1f4e120 (Fix #166)\"\nAuto-merging packs/actors/MANIFEST-000535 and packs/actors/MANIFEST-000475, both renamed from packs/actors/MANIFEST-000471\nAuto-merging packs/actors/LOG.old\nCONFLICT (content): Merge conflict in packs/actors/LOG.old\nAuto-merging packs/actors/LOG\nCONFLICT (content): Merge conflict in packs/actors/LOG\nAuto-merging packs/actors/CURRENT\nCONFLICT (content): Merge conflict in packs/actors/CURRENT\nCONFLICT (rename/delete): packs/actions/MANIFEST-000471 deleted in HEAD and renamed to packs/actions/MANIFEST-000475 in 1f4e120 (Fix #166). Version 1f4e120 (Fix #166) of packs/actions/MANIFEST-000475 left in tree.\nAuto-merging packs/actions/LOG.old\nCONFLICT (content): Merge conflict in packs/actions/LOG.old\nAuto-merging packs/actions/LOG\nCONFLICT (content): Merge conflict in packs/actions/LOG\nAuto-merging packs/actions/CURRENT\nCONFLICT (content): Merge conflict in packs/actions/CURRENT\n (1)",
        "status": "interactive rebase in progress; onto edbe67a\nLast command done (1 command done):\n   pick 1f4e120 Fix #166\nNo commands remaining.\nYou are currently rebasing branch 'master' on 'edbe67a'.\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\tnew file:   packs/actions/000477.log\n\tnew file:   packs/actors/000477.log\n\tnew file:   packs/macros/000502.log\n\tnew file:   packs/macros/MANIFEST-000500\n\nUnmerged paths:\n  (use \"git restore --staged <file>...\" to unstage)\n  (use \"git add/rm <file>...\" as appropriate to mark resolution)\n\tboth modified:   packs/actions/CURRENT\n\tboth modified:   packs/actions/LOG\n\tboth modified:   packs/actions/LOG.old\n\tadded by them:   packs/actions/MANIFEST-000475\n\tboth modified:   packs/actors/CURRENT\n\tboth modified:   packs/actors/LOG\n\tboth modified:   packs/actors/LOG.old\n\tboth deleted:    packs/actors/MANIFEST-000471\n\tadded by them:   packs/actors/MANIFEST-000475\n\tadded by us:     packs/actors/MANIFEST-000535\n\tadded by them:   packs/macros/000504.ldb\n\tdeleted by us:   packs/macros/CURRENT\n\tdeleted by us:   packs/macros/LOG\n\tdeleted by us:   packs/macros/LOG.old\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   module/blacklistMenu.js\n\tmodified:   module/pf2e-animations.js\n\n"
    },
    "id": 466002,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/466002/?format=api"
}