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/automated-evocations-variant-fork/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2023-05-08T11:06:45.928142Z",
    "action": 23,
    "target": "Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\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 c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in gulpfile.js\nAuto-merging gulpfile.js\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .prettierrc.js\nAuto-merging .prettierrc.js\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\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 c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in gulpfile.js\nAuto-merging gulpfile.js\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .prettierrc.js\nAuto-merging .prettierrc.js\n (1)",
        "status": "interactive rebase in progress; onto 688b107\nLast command done (1 command done):\n   pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n   pick a7789b6 Translated using Weblate (French)\n   pick 3dada62 beta\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '688b107'.\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:      .prettierrc.js\n\tboth added:      README.md\n\tboth added:      changelog.md\n\tboth added:      gulpfile.js\n\tboth added:      package-lock.json\n\tboth added:      package.json\n\tboth added:      src/languages/fr.json\n\tboth added:      src/module.json\n\tboth added:      src/scripts/api.js\n\tboth added:      src/scripts/autoevocations/automatedevocations.js\n\tboth added:      src/scripts/autoevocations/dnd5e.js\n\tboth added:      src/scripts/autoevocations/pf2e.js\n\tboth added:      src/scripts/companionmanager.js\n\tboth added:      src/scripts/config.js\n\tboth added:      src/scripts/constants.js\n\tboth added:      src/scripts/custombindings.js\n\tboth added:      src/scripts/lib/lib.js\n\tboth added:      src/scripts/macros.js\n\tboth added:      src/scripts/main.js\n\tboth added:      src/scripts/preloadTemplates.js\n\tboth added:      src/styles/comapnionmanager.css\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
    },
    "id": 317259,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/317259/?format=api"
}