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.

Sign up for GitHub

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

Jump to bottom

[FIX] printReceipt #34

Open
wants to merge 1 commit into
base: 14.0
Choose a base branch
from
Open

[FIX] printReceipt #34

wants to merge 1 commit into from

Conversation

PierrickBrun
Copy link
Member

This was not working (and of no use)

@PierrickBrun
Copy link
Member Author

/ocabot rebase

@github-grap-bot
Copy link
Contributor

@PierrickBrun 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: [FIX] printReceipt
Using index info to reconstruct a base tree...
M	pos_sale_order/templates/assets.xml
Falling back to patching base and 3-way merge...
Auto-merging pos_sale_order/templates/assets.xml
CONFLICT (content): Merge conflict in pos_sale_order/templates/assets.xml
Removing pos_sale_order/static/src/js/AbstractReceiptScreen.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 [FIX] printReceipt
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".

@PierrickBrun
Copy link
Member Author

/ocabot rebase

@github-grap-bot
Copy link
Contributor

@PierrickBrun 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: [FIX] printReceipt
Using index info to reconstruct a base tree...
M	pos_sale_order/templates/assets.xml
Falling back to patching base and 3-way merge...
Auto-merging pos_sale_order/templates/assets.xml
CONFLICT (content): Merge conflict in pos_sale_order/templates/assets.xml
Removing pos_sale_order/static/src/js/AbstractReceiptScreen.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 [FIX] printReceipt
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
Reviewers
No reviews
Assignees
No one assigned
Labels
needs review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@PierrickBrun @github-grap-bot