Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][FIX] account_ux: Found possible duplicates #349

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

ticket 48922

Should only be applied to statement lines on the same journal. Before this change, we were wrongly suggestion duplicated because we were searching across journals.

Forward-Port-Of: #329

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

Ping @zaoral cherrypicking of pull request #329 failed.

stdout:

Auto-merging account_ux/__manifest__.py
CONFLICT (content): Merge conflict in account_ux/__manifest__.py

stderr:

18:00:59.042318 git.c:439               trace: built-in: git cherry-pick 67295820abafacc47274ac535df24c30e76c5298
error: could not apply 67295820... [FIX] account_ux: Found possible duplicates
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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.

@zaoral
Copy link
Contributor

zaoral commented Jul 25, 2022

@roboadhoc r+

@zaoral
Copy link
Contributor

zaoral commented Jul 25, 2022

@roboadhoc r-

@zaoral zaoral force-pushed the 15.0-13.0-h-48922-kz-F6LR-fw branch from 7a3abf0 to 3ca6e6b Compare October 6, 2022 16:07
@zaoral
Copy link
Contributor

zaoral commented Oct 14, 2022

rebase, functional test, and merge

@zaoral zaoral force-pushed the 15.0-13.0-h-48922-kz-F6LR-fw branch 2 times, most recently from 3b0f853 to 40d9a1c Compare November 7, 2022 14:52
Should only be applied to statement lines on the same journal.
Before this change we were wrongly suggestion duplicated because
we were searching across journals.

X-original-commit: 225ae31
@zaoral zaoral force-pushed the 15.0-13.0-h-48922-kz-F6LR-fw branch from 40d9a1c to c748c8d Compare November 7, 2022 15:28
@zaoral
Copy link
Contributor

zaoral commented Nov 7, 2022

@roboadhoc r+

@roboadhoc roboadhoc closed this in 635f14b Nov 7, 2022
@roboadhoc roboadhoc temporarily deployed to merge November 7, 2022 15:47 Inactive
@zaoral zaoral deleted the 15.0-13.0-h-48922-kz-F6LR-fw branch November 7, 2022 18:32
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.

None yet

3 participants