Skip to content

[FW][FIX] coding_guidelines: Add comment to indicate ASCII-based ordering #12962

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

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 18, 2025

Following the fix - 92c7099 Adding a comment to explicitly indicate that the import is ordered alphabetically based on ASCII values.

Forward-Port-Of: #12951

@robodoo
Copy link
Collaborator

robodoo commented Apr 18, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 18, 2025

@hamo-odoo cherrypicking of pull request #12951 failed.

stdout:

Auto-merging content/contributing/development/coding_guidelines.rst
CONFLICT (content): Merge conflict in content/contributing/development/coding_guidelines.rst

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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

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

Following the fix - 92c7099
Adding a comment to explicitly indicate that the import is ordered
alphabetically based on ASCII values.

X-original-commit: a9577b5
@hamo-odoo hamo-odoo force-pushed the saas-18.2-16.0-coding-guidelines-ascii-comment-fix-hamo-430549-fw branch from 29e6b9f to cfc755d Compare April 21, 2025 05:01
Copy link
Contributor

@hamo-odoo hamo-odoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@C3POdoo C3POdoo requested a review from a team April 21, 2025 05:03
robodoo pushed a commit that referenced this pull request Apr 21, 2025
Following the fix - 92c7099
Adding a comment to explicitly indicate that the import is ordered
alphabetically based on ASCII values.

closes #12962

X-original-commit: a9577b5
Signed-off-by: Harsh Modi (hamo) <hamo@odoo.com>
@robodoo
Copy link
Collaborator

robodoo commented Apr 21, 2025

@hamo-odoo staging failed: ci/runbot on 9d51fabb55e2fdd4f500606f59a76d14c90fa6b0 (view more at https://runbot.odoo.com/runbot/build/78795641)

@hamo-odoo
Copy link
Contributor

@robodoo retry

robodoo pushed a commit that referenced this pull request Apr 21, 2025
Following the fix - 92c7099
Adding a comment to explicitly indicate that the import is ordered
alphabetically based on ASCII values.

closes #12962

X-original-commit: a9577b5
Signed-off-by: Harsh Modi (hamo) <hamo@odoo.com>
@robodoo robodoo closed this Apr 21, 2025
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.

3 participants