Change Instance

HTTP 200 OK
Allow: GET, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "unit": null,
    "component": "http://weblate.ops404.it/api/components/ooops-base/base_location_italian_cities_import/?format=api",
    "translation": null,
    "glossary_term": null,
    "user": null,
    "author": null,
    "timestamp": "2021-06-28T16:27:41.783500+02:00",
    "action": 23,
    "target": "First, rewinding head to replay your work on top of it...\nApplying: Update from template, fix linting\nUsing index info to reconstruct a base tree...\nM\t.flake8\nM\t.github/workflows/ci-pr.yml\nM\t.github/workflows/ci-push.yml\nM\t.pre-commit-config.yaml\nM\t.style.yapf\nM\tREADME.md\nM\tbase_location_italian_cities_import/views/res_city_view.xml\nM\tbase_location_italian_cities_import/wizard/istat_import_view.xml\nM\tooops_base_contracts/models/models.py\nM\tooops_base_import_async/models/base_import_import.py\nM\tooops_cap/__manifest__.py\nM\tooops_interviews/__manifest__.py\nM\tooops_interviews/data/sequence.xml\nM\tooops_interviews/models/ooops_interviews.py\nM\tooops_interviews/security/ir.model.access.csv\nM\tooops_interviews/views/ooops_interviews.xml\nM\tooops_interviews/views/report_interview.xml\nM\tooops_interviews/views/res_partner.xml\nM\tooops_interviews/views/sale_order.xml\nM\tooops_report_base/__manifest__.py\nM\tooops_report_base/data/report_layout.xml\nM\tooops_report_base/views/templates.xml\nM\tooops_report_hide_price/models/sale.py\nM\tooops_report_invoice/__manifest__.py\nM\tooops_report_invoice/models/res_company.py\nM\tooops_report_invoice/views/templates.xml\nM\tooops_report_journal/__manifest__.py\nM\tooops_report_journal/views/report_journal.xml\nM\tooops_title_customization/__init__.py\nM\tooops_title_customization/__manifest__.py\nM\tooops_title_customization/models/purchase_model.py\nM\tooops_title_customization/models/sales_model.py\nM\tooops_title_customization/views/purchase_view.xml\nM\tooops_title_customization/views/sales_view.xml\nFalling back to patching base and 3-way merge...\nAuto-merging .github/workflows/ci-push.yml\nCONFLICT (add/add): Merge conflict in .github/PULL_REQUEST_TEMPLATE.md\nAuto-merging .github/PULL_REQUEST_TEMPLATE.md\nCONFLICT (add/add): Merge conflict in .copier-answers.yml\nAuto-merging .copier-answers.yml\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Update from template, fix linting\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 (1)",
    "id": 15961,
    "action_name": "Failed rebase on repository",
    "url": "http://weblate.ops404.it/api/changes/15961/?format=api"
}