[FW][FIX] Fix issue https://github.com/ingadhoc/odoo-argentina-ce/issues/… #48
+182
−18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stdout: Auto-merging l10n_ar_afipws_fe/models/account_move.py CONFLICT (content): Merge conflict in l10n_ar_afipws_fe/models/account_move.py stderr: 20:09:22.272723 git.c:444 trace: built-in: git cherry-pick bd114fd error: could not apply bd114fd... [FIX] Fix issue ingadhoc#28 and ingadhoc#32 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:
|
@filoquin @maq-adhoc cherrypicking of pull request #47 failed. stdout: stderr: 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. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…28 and #32
Forward-Port-Of: #47