Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/yunohost/admin/changes/?format=api&page=785
https://translate.yunohost.org/api/components/yunohost/admin/changes/?format=api&page=786", "previous": "https://translate.yunohost.org/api/components/yunohost/admin/changes/?format=api&page=784", "results": [ { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:50.672648Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19620, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19620/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:42.097611Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19617, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19617/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:35.405284Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19614, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19614/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:29.361316Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19611, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19611/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:22.136340Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19606, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19606/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:14.130661Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19601, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19601/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:09.054602Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19598, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19598/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:05.313516Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19596, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19596/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:31:03.059889Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19593, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19593/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:30:58.027028Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19590, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19590/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:30:53.330042Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19586, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19586/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:30:39.035925Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19584, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19584/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:30:32.987192Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19582, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19582/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:30:29.139224Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19580, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19580/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:30:13.312255Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19576, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19576/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:30:00.281851Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19573, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19573/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T19:29:51.169032Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19571, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19571/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T15:03:54.994522Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19564, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19564/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-10T15:03:50.752652Z", "action": 53, "target": "", "id": 19563, "action_name": "Repository notification received", "url": "https://translate.yunohost.org/api/changes/19563/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-08T15:30:57.465541Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19550, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19550/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-08T07:17:14.423754Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19544, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19544/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-08T07:12:06.297572Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19542, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19542/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-08T02:37:10.418109Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19539, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19539/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-07T11:30:12.996545Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19516, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19516/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-07T10:21:05.885690Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19513, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19513/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-07T00:38:53.908381Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19509, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19509/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-07T00:38:19.535524Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19507, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19507/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-06T12:05:26.549820Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19503, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19503/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-05T20:11:15.036850Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19501, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19501/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-05T01:11:39.500140Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19497, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19497/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-04T19:40:15.404099Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19494, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19494/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:34:11.842189Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19468, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19468/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:33:32.293334Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19465, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19465/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:28:18.471514Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19463, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19463/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:27:16.979480Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19461, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19461/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:26:26.301888Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19460, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19460/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:21:48.986933Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19457, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19457/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:21:27.242828Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19456, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19456/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:19:46.985555Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19453, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19453/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:19:38.182513Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19452, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19452/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:18:55.404391Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19450, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19450/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:17:33.819852Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19447, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19447/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:17:17.734719Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19446, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19446/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:16:26.093919Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19443, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19443/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:14:44.956382Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19441, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19441/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:11:42.383988Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19439, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19439/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:10:11.250075Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19437, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19437/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:10:00.378695Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19435, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19435/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:09:43.386529Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19433, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19433/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-03T18:09:39.243015Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Update changelog for 4.1.0\nUsing index info to reconstruct a base tree...\nM\tdebian/changelog\nFalling back to patching base and 3-way merge...\nAuto-merging debian/changelog\nCONFLICT (content): Merge conflict in debian/changelog\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update changelog for 4.1.0\n\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\".\n\n (1)", "id": 19431, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/19431/?format=api" } ] }{ "count": 42054, "next": "