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=783
https://translate.yunohost.org/api/components/yunohost/admin/changes/?format=api&page=784", "previous": "https://translate.yunohost.org/api/components/yunohost/admin/changes/?format=api&page=782", "results": [ { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:24:03.106190Z", "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": 20319, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20319/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:23:59.220398Z", "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": 20316, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20316/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:22:33.288829Z", "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": 20314, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20314/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:22:01.156568Z", "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": 20309, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20309/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:21:55.938989Z", "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": 20307, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20307/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:21:49.758719Z", "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": 20304, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20304/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:17:27.748858Z", "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": 20300, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20300/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-25T20:17:03.792907Z", "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": 20299, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20299/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:36.736454Z", "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": 20293, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20293/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:11.837112Z", "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": 20291, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20291/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:12:06.071109Z", "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": 20289, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20289/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:20.632898Z", "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": 20287, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20287/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:12.350245Z", "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": 20284, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20284/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:06.374631Z", "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": 20282, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20282/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:07:00.614811Z", "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": 20280, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20280/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:54.724091Z", "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": 20278, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20278/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:48.976407Z", "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": 20277, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20277/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:43.215353Z", "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": 20275, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20275/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:37.363581Z", "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": 20273, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20273/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:31.623286Z", "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": 20271, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20271/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:25.840132Z", "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": 20269, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20269/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:20.127094Z", "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": 20267, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20267/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:14.188531Z", "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": 20265, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20265/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:08.341827Z", "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": 20262, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20262/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:06:03.225938Z", "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": 20261, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20261/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:56.130465Z", "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": 20258, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20258/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:49.939609Z", "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": 20256, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20256/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:43.493426Z", "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": 20255, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20255/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:37.134964Z", "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": 20252, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20252/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:30.802919Z", "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": 20250, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20250/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:25.068944Z", "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": 20249, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20249/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:19.329216Z", "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": 20247, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20247/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T19:05:12.853290Z", "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": 20244, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20244/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-20T18:53:13.856522Z", "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": 20242, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20242/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:29.907812Z", "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": 20240, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20240/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:26.003904Z", "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": 20237, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20237/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:22.189574Z", "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": 20235, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20235/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:18.716530Z", "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": 20233, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20233/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:16.067526Z", "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": 20231, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20231/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:12.601585Z", "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": 20229, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20229/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:09.680653Z", "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": 20227, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20227/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:06.240238Z", "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": 20225, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20225/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:02.904606Z", "action": 18, "target": "", "id": 20223, "action_name": "Changes pushed", "url": "https://translate.yunohost.org/api/changes/20223/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:42:00.632725Z", "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": 20222, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20222/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:41:57.856562Z", "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": 20221, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20221/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:41:55.787101Z", "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": 20219, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20219/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:41:54.059783Z", "action": 18, "target": "", "id": 20217, "action_name": "Changes pushed", "url": "https://translate.yunohost.org/api/changes/20217/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:41:51.122844Z", "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": 20215, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20215/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:41:49.738074Z", "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": 20214, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20214/?format=api" }, { "unit": null, "component": "https://translate.yunohost.org/api/components/yunohost/admin/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2020-12-19T17:41:47.899822Z", "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": 20213, "action_name": "Repository rebase failed", "url": "https://translate.yunohost.org/api/changes/20213/?format=api" } ] }{ "count": 42054, "next": "