Skip to content

Conversation

@carmenbianca
Copy link
Member

Description

Needed for #88

Odoo task (if applicable)

Checklist before approval

  • Tests are present (or not needed).
  • Credits/copyright have been changed correctly.
  • Change log snippet is present.
  • (If a new module) Moving this to OCA has been considered.

Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
@carmenbianca carmenbianca changed the base branch from 12.0 to 11.0 December 8, 2022 08:45
@carmenbianca
Copy link
Member Author

/ocabot merge nobump

@github-grap-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 11.0-ocabot-merge-pr-270-by-carmenbianca-bump-nobump, awaiting test results.

github-grap-bot added a commit that referenced this pull request Dec 8, 2022
Signed-off-by carmenbianca
@github-grap-bot
Copy link
Contributor

@carmenbianca your merge command was aborted due to failed check(s), which you can inspect on this commit of 11.0-ocabot-merge-pr-270-by-carmenbianca-bump-nobump.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@carmenbianca
Copy link
Member Author

Leaving this for now.

@carmenbianca
Copy link
Member Author

This will fail, but doing this to test ocabot.

/ocabot rebase

@github-grap-bot
Copy link
Contributor

@carmenbianca The rebase process failed, because command git rebase origin/11.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [UPD] Apply template
Applying: [FIX] Satisfy pre-commit
Using index info to reconstruct a base tree...
M	portal_partner_isr/controllers/main.py
Falling back to patching base and 3-way merge...
Auto-merging portal_partner_isr/controllers/main.py
CONFLICT (content): Merge conflict in portal_partner_isr/controllers/main.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 [FIX] Satisfy pre-commit
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".

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants