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/kanka-foundry/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2024-11-17T11:52:48.991182Z",
    "action": 23,
    "target": "warning: skipped previously applied commit 2f816c8\nhint: use --reapply-cherry-picks to include skipped commits\nhint: Disable this message with \"git config advice.skippedCherryPicks false\"\nRebasing (1/1)\nAuto-merging .github/workflows/release.yml\nCONFLICT (content): Merge conflict in .github/workflows/release.yml\nAuto-merging CHANGELOG.md\nCONFLICT (content): Merge conflict in CHANGELOG.md\nAuto-merging package-lock.json\nCONFLICT (content): Merge conflict in package-lock.json\nAuto-merging package.json\nCONFLICT (content): Merge conflict in package.json\nerror: could not apply 83770a7... ci: fix foundry deployment\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 83770a7... ci: fix foundry deployment\n (1)",
    "old": "",
    "details": {
        "error": "warning: skipped previously applied commit 2f816c8\nhint: use --reapply-cherry-picks to include skipped commits\nhint: Disable this message with \"git config advice.skippedCherryPicks false\"\nRebasing (1/1)\nAuto-merging .github/workflows/release.yml\nCONFLICT (content): Merge conflict in .github/workflows/release.yml\nAuto-merging CHANGELOG.md\nCONFLICT (content): Merge conflict in CHANGELOG.md\nAuto-merging package-lock.json\nCONFLICT (content): Merge conflict in package-lock.json\nAuto-merging package.json\nCONFLICT (content): Merge conflict in package.json\nerror: could not apply 83770a7... ci: fix foundry deployment\nhint: Resolve all conflicts manually, mark them as resolved with\nhint: \"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nhint: You can instead skip this commit: run \"git rebase --skip\".\nhint: To abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply 83770a7... ci: fix foundry deployment\n (1)",
        "status": "interactive rebase in progress; onto d2c2e0d\nLast command done (1 command done):\n   pick 83770a7 ci: fix foundry deployment\nNo commands remaining.\nYou are currently rebasing branch 'main' on 'd2c2e0d'.\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 modified:   .github/workflows/release.yml\n\tboth modified:   CHANGELOG.md\n\tboth modified:   package-lock.json\n\tboth modified:   package.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
    },
    "id": 490843,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/490843/?format=api"
}