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

[14.0][REF] l10n_it_central_journal_reportlab: update title like report in "l10n_it_central_journal" #3537

Merged

Conversation

@Borruso Borruso force-pushed the 14.0-ref-l10n_it_central_journal_reportlab-title branch from 1c0278d to 540ff2b Compare August 24, 2023 12:52
@Borruso Borruso changed the title [REF] l10n_it_central_journal_reportlab: update title like report in "l10n_it_central_journal" [14.0][REF] l10n_it_central_journal_reportlab: update title like report in "l10n_it_central_journal" Aug 24, 2023
@sergiocorato
Copy link
Contributor

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@sergiocorato The rebase process failed, because command git rebase origin/14.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [REF] l10n_it_central_journal_reportlab: update title like report in "l10n_it_central_journal"
Using index info to reconstruct a base tree...
M	l10n_it_central_journal_reportlab/wizard/print_giornale.py
Falling back to patching base and 3-way merge...
Auto-merging l10n_it_central_journal_reportlab/wizard/print_giornale.py
CONFLICT (content): Merge conflict in l10n_it_central_journal_reportlab/wizard/print_giornale.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 [REF] l10n_it_central_journal_reportlab: update title like report in "l10n_it_central_journal"
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".

@Borruso Borruso force-pushed the 14.0-ref-l10n_it_central_journal_reportlab-title branch from 540ff2b to a7e1e1f Compare January 11, 2024 10:23
@sergiocorato
Copy link
Contributor

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@sergiocorato The rebase process failed, because command git rebase origin/14.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [REF] l10n_it_central_journal_reportlab: update title like report in "l10n_it_central_journal"
Using index info to reconstruct a base tree...
M	l10n_it_central_journal_reportlab/wizard/print_giornale.py
Falling back to patching base and 3-way merge...
Auto-merging l10n_it_central_journal_reportlab/wizard/print_giornale.py
CONFLICT (content): Merge conflict in l10n_it_central_journal_reportlab/wizard/print_giornale.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 [REF] l10n_it_central_journal_reportlab: update title like report in "l10n_it_central_journal"
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".

@sergiocorato sergiocorato force-pushed the 14.0-ref-l10n_it_central_journal_reportlab-title branch from 22a1f6b to d4e5468 Compare February 27, 2024 18:35
@sergiocorato sergiocorato force-pushed the 14.0-ref-l10n_it_central_journal_reportlab-title branch from d4e5468 to abad789 Compare February 27, 2024 18:36
@sergiocorato
Copy link
Contributor

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 14.0-ocabot-merge-pr-3537-by-sergiocorato-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Feb 28, 2024
Signed-off-by sergiocorato
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 14.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 14.0-ocabot-merge-pr-3537-by-sergiocorato-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Feb 28, 2024
Signed-off-by sergiocorato
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 14.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 14.0-ocabot-merge-pr-3537-by-sergiocorato-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Feb 28, 2024
Signed-off-by sergiocorato
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 14.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 14.0-ocabot-merge-pr-3537-by-sergiocorato-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit e8ebc4a into OCA:14.0 Feb 28, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 608729f. Thanks a lot for contributing to OCA. ❤️

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.

l10n_it_central_journal_reportlab: update title like report in "l10n_it_central_journal"
4 participants