Change Instance

HTTP 200 OK
Allow: GET, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "unit": null,
    "component": "https://hosted.weblate.org/api/components/sdaps/sdaps-class/?format=api",
    "translation": null,
    "user": "https://hosted.weblate.org/api/users/benzea/?format=api",
    "author": null,
    "timestamp": "2023-03-19T13:45:52.824756+01:00",
    "action": 23,
    "target": "Rebasing (1/3)\nerror: could not apply 7023705... test translations\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 7023705... test translations\nCONFLICT (add/add): Merge conflict in testfiles/pdftest.xetex.tlg\nAuto-merging testfiles/pdftest.xetex.tlg\nCONFLICT (add/add): Merge conflict in testfiles/pdftest.tlg\nAuto-merging testfiles/pdftest.tlg\nCONFLICT (add/add): Merge conflict in testfiles/classic.tlg\nAuto-merging testfiles/classic.tlg\nCONFLICT (add/add): Merge conflict in testfiles/base.xetex.tlg\nAuto-merging testfiles/base.xetex.tlg\nCONFLICT (add/add): Merge conflict in testfiles/base.tlg\nAuto-merging testfiles/base.tlg\nCONFLICT (add/add): Merge conflict in testfiles/base.lvt\nAuto-merging testfiles/base.lvt\nCONFLICT (add/add): Merge conflict in testfiles/base-textboxes.xetex.tlg\nAuto-merging testfiles/base-textboxes.xetex.tlg\nCONFLICT (add/add): Merge conflict in testfiles/base-textboxes.tlg\nAuto-merging testfiles/base-textboxes.tlg\nCONFLICT (add/add): Merge conflict in build.lua\nAuto-merging build.lua\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/3)\nerror: could not apply 7023705... test translations\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 7023705... test translations\nCONFLICT (add/add): Merge conflict in testfiles/pdftest.xetex.tlg\nAuto-merging testfiles/pdftest.xetex.tlg\nCONFLICT (add/add): Merge conflict in testfiles/pdftest.tlg\nAuto-merging testfiles/pdftest.tlg\nCONFLICT (add/add): Merge conflict in testfiles/classic.tlg\nAuto-merging testfiles/classic.tlg\nCONFLICT (add/add): Merge conflict in testfiles/base.xetex.tlg\nAuto-merging testfiles/base.xetex.tlg\nCONFLICT (add/add): Merge conflict in testfiles/base.tlg\nAuto-merging testfiles/base.tlg\nCONFLICT (add/add): Merge conflict in testfiles/base.lvt\nAuto-merging testfiles/base.lvt\nCONFLICT (add/add): Merge conflict in testfiles/base-textboxes.xetex.tlg\nAuto-merging testfiles/base-textboxes.xetex.tlg\nCONFLICT (add/add): Merge conflict in testfiles/base-textboxes.tlg\nAuto-merging testfiles/base-textboxes.tlg\nCONFLICT (add/add): Merge conflict in build.lua\nAuto-merging build.lua\n (1)",
        "status": "interactive rebase in progress; onto c201f9e\nLast command done (1 command done):\n   pick 7023705 test translations\nNext commands to do (2 remaining commands):\n   pick 7857046 Added translation using Weblate (German)\n   pick c72b83e Translated using Weblate (German)\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'benzea/translations' on 'c201f9e'.\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:   dict/src/en.ini\n\nUnmerged paths:\n  (use \"git restore --staged <file>...\" to unstage)\n  (use \"git add <file>...\" to mark resolution)\n\tboth added:      build.lua\n\tboth added:      testfiles/base-textboxes.tlg\n\tboth added:      testfiles/base-textboxes.xetex.tlg\n\tboth added:      testfiles/base.lvt\n\tboth added:      testfiles/base.tlg\n\tboth added:      testfiles/base.xetex.tlg\n\tboth added:      testfiles/classic.tlg\n\tboth added:      testfiles/pdftest.tlg\n\tboth added:      testfiles/pdftest.xetex.tlg\n\n"
    },
    "id": 51761383,
    "action_name": "Repository rebase failed",
    "url": "https://hosted.weblate.org/api/changes/51761383/?format=api"
}