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:01:36.171458Z",
    "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 README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\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 README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\n (1)",
        "status": "interactive rebase in progress; onto f1f2dbf\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 'f1f2dbf'.\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:   .editorconfig\n\tnew file:   .eslintignore\n\tnew file:   .eslintrc\n\tnew file:   .github/ISSUE_TEMPLATE/bug_report.md\n\tnew file:   .github/ISSUE_TEMPLATE/feature_request.md\n\tnew file:   .github/ISSUE_TEMPLATE/styling.md\n\tnew file:   .github/workflows/release.yml\n\tnew file:   .gitignore\n\tnew file:   .prettierrc.js\n\tnew file:   changelog.md\n\tnew file:   foundryconfig.json\n\tnew file:   gulpfile.js\n\tnew file:   jsdoc-conf.json\n\tnew file:   package-lock.json\n\tnew file:   package.json\n\tnew file:   src/assets/animations/JB2A/BardicInspiration_01_Regular_GreenOrange_400x400.webm\n\tnew file:   src/assets/animations/JB2A/Conjuration_01_Yellow_Circle_800x800.webm\n\tnew file:   src/assets/animations/JB2A/Darkness_01_Black_600x600.webm\n\tnew file:   src/assets/animations/JB2A/Explosion_02_Blue_400x400.webm\n\tnew file:   src/assets/animations/JB2A/IceSpikesRadialBurst_01_Regular_White_1000x1000.webm\n\tnew file:   src/assets/animations/JB2A/Impact_12_Regular_Blue_400x400.webm\n\tnew file:   src/assets/animations/JB2A/LightningBall_01_Regular_Blue_400x400.webm\n\tnew file:   src/assets/animations/JB2A/LightningStrike_01a_800x800.webm\n\tnew file:   src/assets/animations/JB2A/OutPulse_01_Regular_BlueWhite_Burst_600x600.webm\n\tnew file:   src/assets/animations/JB2A/SnowflakeBurst_01_Regular_BlueWhite_Burst_600x600.webm\n\tnew file:   src/assets/animations/JB2A/Whirlwind_01_BlueGrey_01_400x400.webm\n\tnew file:   src/assets/animations/air_infinity_RECTANGLE_01.webm\n\tnew file:   src/assets/animations/air_portal_CIRCLE_01.webm\n\tnew file:   src/assets/animations/air_puff_CIRCLE_01.webm\n\tnew file:   src/assets/animations/create_water_CIRCLE_01.webm\n\tnew file:   src/assets/animations/electric_blast_01.webm\n\tnew file:   src/assets/animations/energy_ball_CIRCLE.webm\n\tnew file:   src/assets/animations/energy_blasts_SQUARE_01.webm\n\tnew file:   src/assets/animations/energy_pulse_yellow_CIRCLE.webm\n\tnew file:   src/assets/animations/energy_spark_CIRCLE_01.webm\n\tnew file:   src/assets/animations/fire_earth_explosion_CIRCLE_01.webm\n\tnew file:   src/assets/animations/fire_spiral_CIRCLE_01.webm\n\tnew file:   src/assets/animations/four_element_strike_SQUARE_01.webm\n\tnew file:   src/assets/animations/heart_red_SQUARE.webm\n\tnew file:   src/assets/animations/magic_explosion_symbol_CIRCLE.webm\n\tnew file:   src/assets/animations/magic_symbol_SQUARE_05.webm\n\tnew file:   src/assets/animations/music_RECTANGLE.webm\n\tnew file:   src/assets/animations/ring_CIRCLE_01.webm\n\tnew file:   src/assets/animations/water_blast_RAY_01.webm\n\tnew file:   src/assets/animations/weird_SQUARE_01.webm\n\tnew file:   src/assets/black-hole-bolas.psd\n\tnew file:   src/assets/black-hole-bolas.svg\n\tnew file:   src/assets/black-hole-bolas.webp\n\tnew file:   src/assets/boomerang-sun.svg\n\tnew file:   src/assets/fvtt-ouroboros.webp\n\tnew file:   src/assets/portal.svg\n\tnew file:   src/automated-evocations-variant.js\n\tnew file:   src/icons/skills/ice_10.jpg\n\tnew file:   src/icons/skills/red_29.jpg\n\tnew file:   src/icons/skills/violet_28.jpg\n\tnew file:   src/icons/skills/weapon_13.jpg\n\tnew file:   src/icons/skills/yellow_08.jpg\n\tnew file:   src/icons/spells/enchant-magenta-2.jpg\n\tnew file:   src/icons/spells/fireball-eerie-3.jpg\n\tnew file:   src/icons/spells/haste-sky-3.jpg\n\tnew file:   src/icons/spells/light-air-fire-3.jpg\n\tnew file:   src/icons/spells/slice-orange-3.jpg\n\tnew file:   src/icons/spells/wild-eerie-3.jpg\n\tnew file:   src/languages/de.json\n\tnew file:   src/languages/en.json\n\tnew file:   src/languages/fr.json\n\tnew file:   src/languages/ja.json\n\tnew file:   src/module.json\n\tnew file:   src/packs/actors.db\n\tnew file:   src/packs/macros.db\n\tnew file:   src/scripts/api.js\n\tnew file:   src/scripts/autoevocations/automatedevocations.js\n\tnew file:   src/scripts/autoevocations/dnd5e.js\n\tnew file:   src/scripts/autoevocations/pf2e.js\n\tnew file:   src/scripts/automatedEvocationsVariantModels.js\n\tnew file:   src/scripts/companionmanager.js\n\tnew file:   src/scripts/config.js\n\tnew file:   src/scripts/constants.js\n\tnew file:   src/scripts/custombindings.js\n\tnew file:   src/scripts/lib/lib.js\n\tnew file:   src/scripts/macros.js\n\tnew file:   src/scripts/main.js\n\tnew file:   src/scripts/preloadTemplates.js\n\tnew file:   src/scripts/socket.js\n\tnew file:   src/styles/comapnionmanager.css\n\tnew file:   src/styles/spellconfig.css\n\tnew file:   src/templates/companionmanager.hbs\n\tnew file:   src/templates/custombindingconfig.hbs\n\tnew file:   src/templates/custombindings.hbs\n\tnew file:   src/templates/spellconfig.hbs\n\tnew file:   wiki/feature_hud_ce_1.gif\n\tnew file:   wiki/feature_hud_ce_1.mp4\n\nUnmerged paths:\n  (use \"git restore --staged <file>...\" to unstage)\n  (use \"git add <file>...\" to mark resolution)\n\tboth added:      .github/workflows/main.yml\n\tboth added:      README.md\n\n"
    },
    "id": 316806,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/316806/?format=api"
}