Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jan 22, 2024

taskid-3377307

Forward-Port-Of: #5943

@robodoo
Copy link
Collaborator

robodoo commented Jan 22, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 22, 2024

@Donapi @xpl-odoo cherrypicking of pull request #5943 failed.

stdout:

Auto-merging content/applications/finance/accounting/bank/reconciliation.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/bank/reconciliation.rst

stderr:

17:33:18.726406 git.c:463               trace: built-in: git cherry-pick 7bdcde5d4fa2418e7bfd7bcf98b848f3e42ef5f7
error: could not apply 7bdcde5d4... [IMP] accounting: reconciliation models update
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@xpl-odoo xpl-odoo force-pushed the saas-16.3-16.0-reconciliation-models-dopi-zxa5-fw branch from c576c1e to 0dcea53 Compare January 23, 2024 09:49
@C3POdoo C3POdoo requested a review from a team January 23, 2024 09:51
@xpl-odoo xpl-odoo force-pushed the saas-16.3-16.0-reconciliation-models-dopi-zxa5-fw branch from 0dcea53 to bc45379 Compare January 23, 2024 09:55
@xpl-odoo xpl-odoo force-pushed the saas-16.3-16.0-reconciliation-models-dopi-zxa5-fw branch from bc45379 to 6656d87 Compare January 23, 2024 10:09
@xpl-odoo
Copy link
Contributor

@Donapi the conflict should be resolved. Let me know if I can r+ or if you need to adapt the content for 16.3 :)

@xpl-odoo
Copy link
Contributor

@robodoo r+

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants