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

[FW][ADD] l10n_uy_account/l10n_uy_edi: demo and afp #104

Closed
wants to merge 1 commit into from

Conversation

fw-bot-adhoc
Copy link
Contributor

Task: 29311

Forward-Port-Of: #91

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@pablohmontenegro @zaoral cherrypicking of pull request #91 failed.

stderr:

21:41:20.365753 git.c:444               trace: built-in: git cherry-pick 7c2659cb34be1dc94ab476ea3082ffe4a63a2586
error: Cherry-picking is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: cherry-pick failed
----------
status:

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.

@roboadhoc roboadhoc force-pushed the 16.0-15.0-t-29311-pam-HH7_-fw branch 3 times, most recently from c3f4c8f to 2ad414d Compare May 15, 2023 22:13
@zaoral zaoral changed the title [FW][ADD] l10n_uy_demo: data demo para Uruguay [FW][ADD] l10n_uy_account/l10n_uy_edi: data demo para Uruguay Aug 9, 2023
@zaoral
Copy link
Contributor

zaoral commented Sep 1, 2023

@roboadhoc r+

@roboadhoc roboadhoc force-pushed the 16.0-15.0-t-29311-pam-HH7_-fw branch from 55c8951 to 672185b Compare September 1, 2023 00:59
@zaoral
Copy link
Contributor

zaoral commented Sep 1, 2023

@roboadhoc rebase-ff

@roboadhoc
Copy link
Contributor

Merge method set to rebase and fast-forward.

@zaoral
Copy link
Contributor

zaoral commented Sep 1, 2023

@roboadhoc r+

@roboadhoc
Copy link
Contributor

@pablohmontenegro @zaoral unable to stage: All commits must have author and committer email, missing email on 0628e9b indicates the authorship is most likely incorrect.

@roboadhoc roboadhoc force-pushed the 16.0-15.0-t-29311-pam-HH7_-fw branch from 672185b to ec962e8 Compare September 1, 2023 01:33
@zaoral
Copy link
Contributor

zaoral commented Sep 1, 2023

@roboadhoc r+

@roboadhoc roboadhoc force-pushed the 16.0-15.0-t-29311-pam-HH7_-fw branch from ec962e8 to 6cde8dd Compare October 2, 2023 19:27
@roboadhoc roboadhoc force-pushed the 16.0-15.0-t-29311-pam-HH7_-fw branch from 6cde8dd to a175bf2 Compare October 17, 2023 19:54
@zaoral zaoral changed the title [FW][ADD] l10n_uy_account/l10n_uy_edi: data demo para Uruguay [FW][ADD] l10n_uy_account/l10n_uy_edi: demo and afp Oct 17, 2023
@zaoral
Copy link
Contributor

zaoral commented Oct 17, 2023

@roboadhoc r+

@zaoral
Copy link
Contributor

zaoral commented Oct 18, 2023

@roboadhoc r-

@roboadhoc roboadhoc force-pushed the 16.0-15.0-t-29311-pam-HH7_-fw branch from a175bf2 to 1cd86c2 Compare October 31, 2023 13:33
@zaoral
Copy link
Contributor

zaoral commented Oct 31, 2023

@roboadhoc r+

@roboadhoc
Copy link
Contributor

@pablohmontenegro @zaoral unable to stage: All commits must have author and committer email, missing email on 1cd86c2 indicates the authorship is most likely incorrect.

@roboadhoc roboadhoc force-pushed the 16.0-15.0-t-29311-pam-HH7_-fw branch from 1cd86c2 to 8afdc5a Compare October 31, 2023 13:50
@zaoral
Copy link
Contributor

zaoral commented Oct 31, 2023

@roboadhoc r+

Fixes to make it work in 16

X-original-commit: 0a166db
X-original-commit: 06b25f3
@roboadhoc roboadhoc force-pushed the 16.0-15.0-t-29311-pam-HH7_-fw branch from 8afdc5a to 392f9ee Compare October 31, 2023 14:03
@zaoral
Copy link
Contributor

zaoral commented Oct 31, 2023

@roboadhoc r+

roboadhoc pushed a commit that referenced this pull request Oct 31, 2023
Fixes to make it work in 16

closes #104

X-original-commit: 0a166db
X-original-commit: 06b25f3
Signed-off-by: Katherine Zaoral <[email protected]>
@roboadhoc roboadhoc temporarily deployed to merge October 31, 2023 14:19 Inactive
@roboadhoc roboadhoc closed this Oct 31, 2023
@zaoral zaoral deleted the 16.0-15.0-t-29311-pam-HH7_-fw branch October 31, 2023 14:21
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