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/terrain-ruler/main/?format=api",
    "translation": null,
    "user": null,
    "author": null,
    "timestamp": "2022-11-21T09:13:29.554029Z",
    "action": 23,
    "target": "Rebasing (1/1)\nerror: could not apply d107c8d... Release v1.7.3\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 d107c8d... Release v1.7.3\nAuto-merging CHANGELOG.md\nCONFLICT (content): Merge conflict in CHANGELOG.md\n (1)",
    "old": "",
    "details": {
        "error": "Rebasing (1/1)\nerror: could not apply d107c8d... Release v1.7.3\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 d107c8d... Release v1.7.3\nAuto-merging CHANGELOG.md\nCONFLICT (content): Merge conflict in CHANGELOG.md\n (1)",
        "status": "interactive rebase in progress; onto d052372\nLast command done (1 command done):\n   pick d107c8d Release v1.7.3\nNo commands remaining.\nYou are currently rebasing branch 'develop' on 'd052372'.\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:   CHANGELOG.md\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
    },
    "id": 129603,
    "action_name": "Repository rebase failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/129603/?format=api"
}