Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/xwiki-contrib/notes-application/changes/?format=api&page=4
{ "count": 7422, "next": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/changes/?format=api&page=5", "previous": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/changes/?format=api&page=3", "results": [ { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-25T03:30:16.033547Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285718, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285718/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-24T03:30:11.225133Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285717, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285717/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-23T03:30:16.071882Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285649, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285649/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-22T03:30:14.151173Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285645, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285645/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-21T03:30:13.559156Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285162, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285162/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-20T03:30:12.878736Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285156, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285156/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-19T03:30:14.776765Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285154, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285154/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-18T07:00:47.135577Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285148, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285148/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-18T07:00:43.028373Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285140, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285140/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-18T03:30:13.498199Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285138, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285138/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-17T14:42:01.810654Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285131, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285131/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-17T14:41:56.623169Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285123, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285123/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-17T03:30:19.712074Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285120, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285120/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-17T00:57:13.219952Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285115, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285115/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-17T00:57:01.045688Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285099, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285099/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-16T12:56:43.351139Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285009, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285009/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-16T12:56:42.091477Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 285008, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/285008/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-16T03:30:12.303763Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284661, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284661/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-15T03:30:12.220906Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284656, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284656/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-14T03:30:20.514425Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284653, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284653/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-13T03:30:29.754953Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284648, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284648/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-12T03:30:12.112850Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284647, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284647/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-11T03:30:13.587955Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284646, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284646/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-10T03:30:11.359243Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284220, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284220/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-09T03:30:11.180728Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284196, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284196/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-08T20:36:45.708005Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284180, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284180/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-08T03:30:13.167564Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284161, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284161/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-07T03:30:12.939339Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284120, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284120/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-06T03:30:11.216706Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284089, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284089/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-05T03:30:10.241821Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 284064, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/284064/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-04T03:30:11.333211Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283896, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283896/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-03T03:30:10.637076Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283894, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283894/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-02T03:30:10.417547Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283886, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283886/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-04-01T03:30:12.464351Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283853, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283853/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-31T03:30:12.006752Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283849, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283849/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-30T03:30:11.971782Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283843, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283843/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-29T03:30:11.174695Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283840, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283840/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-28T03:30:11.254654Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283839, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283839/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-27T03:30:11.203646Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283836, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283836/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-26T03:30:11.064452Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283830, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283830/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-25T03:30:10.404548Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283818, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283818/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-24T23:41:09.977365Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283808, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283808/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-24T03:30:11.650581Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283805, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283805/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-23T03:30:12.716137Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283800, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283800/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-22T03:30:09.742440Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283798, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283798/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-21T03:30:08.538500Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283796, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283796/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-21T02:25:57.360665Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283786, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283786/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-21T01:56:38.374387Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283775, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283775/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-21T01:54:29.041195Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283765, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283765/?format=api" }, { "unit": null, "component": "https://l10n.xwiki.org/api/components/xwiki-contrib/notes-application/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2021-03-20T03:30:11.107675Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Added translation using Weblate (Spanish)\n.git/rebase-apply/patch:7: new blank line at EOF.\n+\nwarning: 1 line adds whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging src/main/resources/NotesCode/Translations.es.xml\nCONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Added translation using Weblate (Spanish)\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": 283761, "action_name": "Repository rebase failed", "url": "https://l10n.xwiki.org/api/changes/283761/?format=api" } ] }