Skip to content

GitLab

TS 33.128 v17.1.0 (2021-06-24) agreed at SA#92-e

5 jobs for test_merge in 1 minute and 31 seconds (queued for 2 seconds)
77d91afe
1 related merge request: !77 Test merge
Status Job ID Name Coverage
  Syntax
passed #12113
checkXSD

00:00:18

passed #12114
parseASN1

00:00:20

 
  Compile And Lint
passed #12115
compileASN1

00:00:17

passed #12116
lintASN1

00:00:17

 
  Merge
failed #12117
MergeTest

00:00:16

 
Name Stage Failure
failed
MergeTest Merge 
Merge NOT OK
cr/TS33128/0171
Merge NOT OK
cr/TS33128/0166
Merge OK
cr/TS33128/0165
Merge OK
Merge conflicts with following branches: {'cr/TS33128/0183': 'Auto-merging 33128/r17/TS33128Payloads.asn\nCONFLICT (content): Merge conflict in 33128/r17/TS33128Payloads.asn\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0178': 'Auto-merging 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd\nCONFLICT (content): Merge conflict in 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0177': 'Auto-merging 33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd\nCONFLICT (content): Merge conflict in 33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0173': 'Auto-merging 33128/r17/TS33128Payloads.asn\nCONFLICT (content): Merge conflict in 33128/r17/TS33128Payloads.asn\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0171': 'Auto-merging 33128/r17/TS33128Payloads.asn\nCONFLICT (content): Merge conflict in 33128/r17/TS33128Payloads.asn\nAutomatic merge failed; fix conflicts and then commit the result.\n'}
ERROR: Job failed: exit code 1