Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/wild-magic-surge-5e/main/changes/?format=api&page=11
{ "count": 1826, "next": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/changes/?format=api&page=12", "previous": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/changes/?format=api&page=10", "results": [ { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-23T16:18:45.079986Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 80bf251\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '80bf251'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 362862, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/362862/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-23T16:18:44.394576Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 362861, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/362861/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-22T01:01:30.151168Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto daf6cb7\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'daf6cb7'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 362634, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/362634/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-22T01:01:29.360486Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 362633, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/362633/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-17T08:55:33.946041Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto d277e53\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd277e53'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 362079, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/362079/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-17T08:55:32.866894Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 362078, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/362078/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-17T00:04:25.674724Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 53b8f36\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '53b8f36'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 362028, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/362028/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-17T00:04:24.328706Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 362027, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/362027/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-16T03:59:01.993849Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 69dc3ec\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '69dc3ec'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 361663, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/361663/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-16T03:59:01.182934Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 361662, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/361662/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-15T19:07:19.257000Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 1465041\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '1465041'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 361535, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/361535/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-15T19:07:18.571246Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 361534, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/361534/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-14T12:53:10.535676Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 1f1d1c9\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '1f1d1c9'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 361275, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/361275/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-14T12:53:09.498634Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 361274, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/361274/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-10T00:33:50.199408Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 68c57c3\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '68c57c3'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 360488, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/360488/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-10T00:33:48.862506Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 360487, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/360487/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-08T03:47:32.228685Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 57b632d\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '57b632d'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 359927, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/359927/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-08T03:47:31.588871Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 359926, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/359926/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-03T08:30:41.658670Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 18e5f19\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '18e5f19'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 356678, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/356678/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-03T08:30:40.536305Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 356677, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/356677/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-03T03:55:28.729661Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 28bd510\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '28bd510'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 356638, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/356638/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-03T03:55:28.119861Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 356637, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/356637/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T03:05:09.306050Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto e99eb22\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'e99eb22'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355966, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355966/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-02T03:05:08.522631Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 355965, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355965/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T10:00:13.080069Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto cbb39d2\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'cbb39d2'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 355775, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/355775/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-07-01T10:00:12.387734Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 355774, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/355774/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-26T04:33:02.245254Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 268d7f0\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '268d7f0'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 352773, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/352773/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-26T04:33:01.586393Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 352772, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/352772/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-24T03:35:04.018846Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 58c6fe4\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '58c6fe4'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 351524, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/351524/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-24T03:35:03.417057Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 351523, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/351523/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-19T22:42:53.219722Z", "action": 47, "target": "", "old": "", "details": { "alert": "RepositoryOutdated" }, "id": 346922, "action_name": "Alert triggered", "url": "https://weblate.foundryvtt-hub.com/api/changes/346922/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-19T04:38:45.163883Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 3ac9411\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '3ac9411'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 346745, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/346745/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-19T04:38:44.461478Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 346744, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/346744/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T15:18:53.366085Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto c731b02\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'c731b02'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 345711, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/345711/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T15:18:52.657358Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 345710, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/345710/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T06:51:48.763540Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto b1d242e\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'b1d242e'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 345681, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/345681/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-18T06:51:48.068565Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 345680, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/345680/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-12T04:32:23.589001Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto cd7c304\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'cd7c304'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 340005, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/340005/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-12T04:32:22.593674Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 340004, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/340004/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-11T22:06:17.256743Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto e32c551\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'e32c551'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 339998, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/339998/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-11T22:06:16.490295Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 339997, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/339997/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-11T16:25:48.165564Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto bd3b0f1\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'bd3b0f1'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 339903, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/339903/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-11T16:25:47.540404Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 339902, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/339902/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-11T09:41:10.344439Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto 5d8892c\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on '5d8892c'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 338401, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/338401/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-11T09:41:09.806496Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 338400, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/338400/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-11T09:34:06.263206Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto f011d86\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'f011d86'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 338397, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/338397/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-11T09:34:05.615819Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 338396, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/338396/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-05T03:39:57.568820Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto d3b6369\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'd3b6369'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 337584, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/337584/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-05T03:39:56.809557Z", "action": 53, "target": "", "old": "", "details": { "repos": [ "git://github.com/johnnolan/wild-magic-surge-5e", "git://github.com/johnnolan/wild-magic-surge-5e.git", "[email protected]:johnnolan/wild-magic-surge-5e", "[email protected]:johnnolan/wild-magic-surge-5e.git", "https://github.com/johnnolan/wild-magic-surge-5e", "https://github.com/johnnolan/wild-magic-surge-5e.git" ], "branch": "main", "repo_url": "https://github.com/johnnolan/wild-magic-surge-5e", "full_name": "johnnolan/wild-magic-surge-5e", "service_long_name": "GitHub" }, "id": 337583, "action_name": "Repository notification received", "url": "https://weblate.foundryvtt-hub.com/api/changes/337583/?format=api" }, { "unit": null, "component": "https://weblate.foundryvtt-hub.com/api/components/wild-magic-surge-5e/main/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2023-06-04T23:06:12.117682Z", "action": 23, "target": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "old": "", "details": { "error": "Rebasing (1/2)\nerror: could not apply 4f40537... Translated using Weblate (French)\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 4f40537... Translated using Weblate (French)\nAuto-merging languages/fr.json\nCONFLICT (content): Merge conflict in languages/fr.json\n (1)", "status": "interactive rebase in progress; onto e92f2f9\nLast command done (1 command done):\n pick 4f40537 Translated using Weblate (French)\nNext command to do (1 remaining command):\n pick 325f731 Translated using Weblate (French)\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'main' on 'e92f2f9'.\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: languages/fr.json\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n" }, "id": 337577, "action_name": "Repository rebase failed", "url": "https://weblate.foundryvtt-hub.com/api/changes/337577/?format=api" } ] }