-
Notifications
You must be signed in to change notification settings - Fork 567
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
Merge to master from origin/neon_underwear_uat #17586
Open
metas-ts
wants to merge
7
commits into
master
Choose a base branch
from
metas-ts/master/merge-from/origin/neon_underwear_uat
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Merge to master from origin/neon_underwear_uat #17586
metas-ts
wants to merge
7
commits into
master
from
metas-ts/master/merge-from/origin/neon_underwear_uat
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
…_merge_from_release solved Conflicts: backend/de.metas.printing/de.metas.printing.base/src/test/java/de/metas/printing/api/impl/PrintingDataTest.java backend/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/api/IInvoiceCandDAO.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/CCreditMemoReasonEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/COrderDeliveryRuleEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/COrderDeliveryViaRuleEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIADOrgLookupBPLGLNVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICBPartnerLookupBPLGLNVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop000VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop111VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop119VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop120VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop140VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop901991VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctopInvoic500VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctopInvoicVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIDesadvFeedbackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerLocationType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerProductVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCCurrencyType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCLocationType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCUOMType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvLineType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpMProductType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExportStatusEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpADInputDataSourceLookupINType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCBPartnerLocationLookupGLNType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCBPartnerLookupRecipientGLNType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCCurrencyLookupISOCodeType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCOLCandType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCOLCandsType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCUOMLookupUOMSymbolType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIInvoiceFeedbackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMHUPIItemProductLookupUPCVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMProductLookupUPCVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMessage.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/FreshCCOUNTRYLOOKUPCOUNTRYCODEType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/InvoicableQtyBasedOnEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ObjectFactory.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationEventEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationModeEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationTypeEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/XLSImpCOLCandType.java
…ar_uat_update_to_5.175
…derwear_uat_update_to_5.175 solved Conflicts: .github/workflows/cicd.yaml backend/de.metas.cucumber/src/test/resources/de/metas/cucumber/features/apiaudit/apiAuditDELETE.feature backend/de.metas.cucumber/src/test/resources/de/metas/cucumber/features/bpartner/createBPartnerV1.feature backend/de.metas.cucumber/src/test/resources/de/metas/cucumber/features/createProductionOrder.feature backend/de.metas.cucumber/src/test/resources/de/metas/cucumber/features/invoicecandidate/packingmaterial/shipments.feature backend/de.metas.cucumber/src/test/resources/de/metas/cucumber/features/materialDispo/production.feature backend/pom.xml misc/parent-pom/pom.xml
…ar_uat_update_to_5.175
…ar_uat_update_to_5.175
…o_5.175 Update to 5.175 - Merge to neon_underwear_uat from neon_underwear_uat_update_to_5.175
…s/master/merge-from/origin/neon_underwear_uat solved Conflicts: .github/workflows/cicd.yaml backend/de.metas.printing/de.metas.printing.base/src/test/java/de/metas/printing/api/impl/PrintingDataTest.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/CCreditMemoReasonEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/COrderDeliveryRuleEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/COrderDeliveryViaRuleEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIADOrgLookupBPLGLNVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICBPartnerLookupBPLGLNVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop000VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop111VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop119VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop120VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop140VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctop901991VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctopInvoic500VType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDICctopInvoicVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIDesadvFeedbackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerLocationType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerProductVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCBPartnerType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCCurrencyType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCLocationType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpCUOMType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvLineType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpDesadvType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExpMProductType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIExportStatusEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpADInputDataSourceLookupINType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCBPartnerLocationLookupGLNType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCBPartnerLookupRecipientGLNType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCCurrencyLookupISOCodeType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCOLCandType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCOLCandsType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIImpCUOMLookupUOMSymbolType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIInvoiceFeedbackType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMHUPIItemProductLookupUPCVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMProductLookupUPCVType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/EDIMessage.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/FreshCCOUNTRYLOOKUPCOUNTRYCODEType.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/InvoicableQtyBasedOnEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ObjectFactory.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationEventEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationModeEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/ReplicationTypeEnum.java misc/services/camel/de-metas-camel-edi/src/main/java-xjc_metasfresh/de/metas/edi/esb/jaxb/metasfresh/XLSImpCOLCandType.java
metas-ts
added
the
ops:dont_auto_merge
This label can be set for mergify to not automatically merge a PR, if it's green and approved
label
Mar 12, 2024
@metas-ts what's the status here? |
(replied to Teo in private) |
status: pending (as discussed with Tobi) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
ops:dont_auto_merge
This label can be set for mergify to not automatically merge a PR, if it's green and approved
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.
!!Don't squash please!! Instead, integrate it with a normal merge commit.