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-marketplace/ooops_odoo_marketplace/?format=api",
    "translation": null,
    "glossary_term": null,
    "user": null,
    "author": null,
    "timestamp": "2021-09-01T23:20:36.489543+02:00",
    "action": 23,
    "target": "First, rewinding head to replay your work on top of it...\nApplying: Fix precommit issues\nUsing index info to reconstruct a base tree...\nM\t.github/PULL_REQUEST_TEMPLATE.md\nM\t.github/workflows/ci-push.yml\nM\tooops_odoo_marketplace/data/ir_actions.xml\nM\tooops_odoo_marketplace/data/ir_ui_menu.xml\nM\tooops_odoo_marketplace/models/ir_ui_menu.py\nM\tooops_odoo_marketplace/models/res_config_settings.py\nM\tooops_odoo_marketplace/models/sale_order_line.py\nM\tooops_odoo_marketplace/models/seller_shop.py\nM\tooops_odoo_marketplace/security/ir_rule.xml\nM\tooops_odoo_marketplace/static/src/scss/main.scss\nM\tooops_odoo_marketplace/views/assets.xml\nM\tooops_odoo_marketplace/views/product_template.xml\nM\tooops_odoo_marketplace/views/res_config_settings.xml\nM\tooops_odoo_marketplace/views/sale_order_line.xml\nM\tooops_odoo_marketplace/views/templates.xml\nM\tooops_odoo_marketplace_booking/controllers/main.py\nM\tooops_odoo_marketplace_booking/models/meeting_request.py\nM\tooops_odoo_marketplace_confirmation_email/data/mail_template.xml\nM\tooops_odoo_marketplace_confirmation_email/models/sale_order.py\nM\tooops_odoo_marketplace_confirmation_email/views/res_config_settings.xml\nM\tooops_odoo_marketplace_confirmation_email/views/templates.xml\nM\tooops_odoo_marketplace_delivery_terms/__manifest__.py\nM\tooops_odoo_marketplace_delivery_terms/controllers/main.py\nM\tooops_odoo_marketplace_delivery_terms/data/ir_actions.xml\nM\tooops_odoo_marketplace_delivery_terms/data/ir_ui_menu.xml\nM\tooops_odoo_marketplace_delivery_terms/models/marketplace_delivery_terms.py\nM\tooops_odoo_marketplace_delivery_terms/models/sale_order_line.py\nM\tooops_odoo_marketplace_delivery_terms/static/src/js/main.js\nM\tooops_odoo_marketplace_delivery_terms/views/assets.xml\nM\tooops_odoo_marketplace_delivery_terms/views/marketplace_delivery_terms.xml\nM\tooops_odoo_marketplace_delivery_terms/views/sale_order.xml\nM\tooops_odoo_marketplace_delivery_terms/views/sale_order_line.xml\nM\tooops_odoo_marketplace_delivery_terms/views/templates.xml\nM\tooops_odoo_marketplace_shipped_by/__manifest__.py\nM\tooops_odoo_marketplace_shipped_by/controllers/main.py\nM\tooops_odoo_marketplace_shipped_by/data/ir_actions.xml\nM\tooops_odoo_marketplace_shipped_by/data/ir_ui_menu.xml\nM\tooops_odoo_marketplace_shipped_by/models/marketplace_shipped_by.py\nM\tooops_odoo_marketplace_shipped_by/models/sale_order_line.py\nM\tooops_odoo_marketplace_shipped_by/static/src/js/main.js\nM\tooops_odoo_marketplace_shipped_by/views/assets.xml\nM\tooops_odoo_marketplace_shipped_by/views/marketplace_shipped_by.xml\nM\tooops_odoo_marketplace_shipped_by/views/sale_order.xml\nM\tooops_odoo_marketplace_shipped_by/views/sale_order_line.xml\nM\tooops_odoo_marketplace_shipped_by/views/templates.xml\nM\tooops_odoo_marketplace_shipping/__manifest__.py\nM\tooops_odoo_marketplace_shipping/controllers/main.py\nM\tooops_odoo_marketplace_shipping/models/sale_order_line.py\nM\tooops_odoo_marketplace_shipping/models/seller_shop_shipping_option.py\nM\tooops_odoo_marketplace_shipping/security/ir_rule.xml\nM\tooops_odoo_marketplace_shipping/static/src/js/main.js\nM\tooops_odoo_marketplace_shipping/views/assets.xml\nM\tooops_odoo_marketplace_shipping/views/sale_order.xml\nM\tooops_odoo_marketplace_shipping/views/sale_order_line.xml\nM\tooops_odoo_marketplace_shipping/views/seller_shop.xml\nM\tooops_odoo_marketplace_shipping/views/templates.xml\nM\tooops_odoo_marketplace_unique_cart/__manifest__.py\nM\tooops_odoo_marketplace_unique_cart/controllers/main.py\nM\tooops_odoo_marketplace_unique_cart/views/templates.xml\nM\tooops_website_sale_infinite_scroll_marketplace/__manifest__.py\nM\tooops_website_sale_infinite_scroll_marketplace/controllers/main.py\nM\tooops_website_sale_infinite_scroll_marketplace/static/src/js/main.js\nM\tooops_website_sale_infinite_scroll_marketplace/static/src/scss/main.scss\nM\tooops_website_sale_infinite_scroll_marketplace/views/assets.xml\nM\tooops_website_sale_infinite_scroll_marketplace/views/templates.xml\nM\tooops_website_sale_sequence_marketplace/__manifest__.py\nM\tooops_website_sale_sequence_marketplace/views/product_template.xml\nFalling back to patching base and 3-way merge...\nAuto-merging ooops_website_sale_infinite_scroll_marketplace/controllers/main.py\nCONFLICT (content): Merge conflict in ooops_website_sale_infinite_scroll_marketplace/controllers/main.py\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Fix precommit issues\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": 20050,
    "action_name": "Failed rebase on repository",
    "url": "http://weblate.ops404.it/api/changes/20050/?format=api"
}