Closed xtanuiha closed 1 month ago
Hi @etobella, some modules you are maintaining are being modified, check this out!
When is the error raised? Can you give a step by step explanation please?
When is the error raised? Can you give a step by step explanation please?
Thank you for the feedback. The Pull Request description has been updated to include steps to reproduce the error.
/ocabot rebase
Congratulations, PR rebased to 17.0.
Thanks! I see the error. The right way to solve it, would be to edit here https://github.com/OCA/account-reconcile/blob/17.0/account_reconcile_oca/views/account_account_reconcile.xml#L153
and use the domain [('account_id', '=', active_id)]
Thanks! I see the error. The right way to solve it, would be to edit here https://github.com/OCA/account-reconcile/blob/17.0/account_reconcile_oca/views/account_account_reconcile.xml#L153
and use the domain
[('account_id', '=', active_id)]
Thank you for your suggestion, I have corrected the code, please review it.
Great! It looks good. Can you squash your commits in a single one and use a better commit message? For example [FIX] account_reconcile_oca: use the right parameters on views
Great! It looks good. Can you squash your commits in a single one and use a better commit message? For example
[FIX] account_reconcile_oca: use the right parameters on views
Squash complete, thanks!
/ocabot rebase
One question. why the history is weird? I mean, you are commiting as OCA-git-bot?
He has rebased over an old branch. That's why I launched a rebase from the bot, but it's not working. @sbidoul is the bot stalled?
@pedrobaeza The rebase process failed, because command git rebase origin/17.0
failed with output:
First, rewinding head to replay your work on top of it...
Applying: Added translation using Weblate (Italian)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in account_reconcile_oca/i18n/it.po
Auto-merging account_reconcile_oca/i18n/it.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Added translation using Weblate (Italian)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
The rebase + conflict resolution must be done by @xtanuiha
@etobella @pedrobaeza Ready for merge, thanks!
I'm afraid not. Now there are 9 commits. You are still doing rebases on old branches. You should fetch first the last content here on OCA. If your OCA remote is origin, and being on the branch of this PR:
git fetch origin 17.0
git rebase origin/17.0
git push -f
I'm afraid not. Now there are 9 commits. You are still doing rebases on old branches. You should fetch first the last content here on OCA. If your OCA remote is origin, and being on the branch of this PR:
git fetch origin 17.0 git rebase origin/17.0 git push -f
Thank you very much for your help! Could you please take a look and confirm if the current status of this PR is correct?
What a great day to merge this nice PR. Let's do it! Prepared branch 17.0-ocabot-merge-pr-653-by-pedrobaeza-bump-minor, awaiting test results.
Congratulations, your PR was merged at 94b9223d784cdcdaa9cecb08e818ec3f69fa1eae. Thanks a lot for contributing to OCA. ❤️
Steps to Reproduce the Error.