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/channel-fear/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2024-05-15T21:02:48.876590Z",
    "action": 23,
    "target": "Rebasing (1/8)\nRebasing (2/8)\nRebasing (3/8)\nerror: could not apply 44c8a27... feat: ability to create items\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 44c8a27... feat: ability to create items\nAuto-merging scss/components/_character-sheet.scss\nCONFLICT (content): Merge conflict in scss/components/_character-sheet.scss\nAuto-merging scss/channel-fear.scss\nCONFLICT (content): Merge conflict in scss/channel-fear.scss\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/8)\nRebasing (2/8)\nRebasing (3/8)\nerror: could not apply 44c8a27... feat: ability to create items\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 44c8a27... feat: ability to create items\nAuto-merging scss/components/_character-sheet.scss\nCONFLICT (content): Merge conflict in scss/components/_character-sheet.scss\nAuto-merging scss/channel-fear.scss\nCONFLICT (content): Merge conflict in scss/channel-fear.scss\n (1)",
        "status": "interactive rebase in progress; onto 42eaed9\nLast commands done (3 commands done):\n   pick 92acc7d feat: allow to resize item sheets\n   pick 44c8a27 feat: ability to create items\n  (see more in file .git/rebase-merge/done)\nNext commands to do (5 remaining commands):\n   pick 1329905 feat: add system background banner\n   pick 78b0d3a feat: add items on actor's sheet\n  (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '42eaed9'.\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:   CHANGELOG.md\n\tmodified:   lang/ca.json\n\tmodified:   lang/en.json\n\tmodified:   lang/fr.json\n\tnew file:   scss/components/_common.scss\n\tmodified:   scss/components/_items.scss\n\tmodified:   template.json\n\tnew file:   templates/item/item-item-sheet.hbs\n\nUnmerged paths:\n  (use \"git restore --staged <file>...\" to unstage)\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   scss/channel-fear.scss\n\tboth modified:   scss/components/_character-sheet.scss\n\n"
    },
    "id": 459526,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/459526/?format=api"
}