Skip to content

GitLab

Update urn_3GPP_ns_li_3GPPX1Extensions.xsd

5 jobs for cr/TS33128/0250 in 1 minute and 51 seconds (queued for 4 seconds)
latest
441a3c2c
1 related merge request: !91 TS 33.128 CR0250 - N9HR LI and S8HR LI: New XSD definitions
Status Job ID Name Coverage
  Syntax
passed #13720
checkXSD

00:00:24

passed #13721
parseASN1

00:00:24

 
  Compile And Lint
passed #13722
compileASN1

00:00:22

passed #13723
lintASN1

00:00:21

 
  Merge
failed #13724
MergeTest

00:00:19

 
Name Stage Failure
failed
MergeTest Merge 
Merge NOT OK
cr/TS33128/0220
Merge NOT OK
cr/TS33128/0216
Merge OK
cr/TS33128/0219
Merge OK
Merge conflicts with following branches: {'cr/33128/0235': 'Auto-merging 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd\nCONFLICT (content): Merge conflict in 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0218': 'Auto-merging 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd\nCONFLICT (content): Merge conflict in 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd\nAutomatic merge failed; fix conflicts and then commit the result.\n', 'cr/TS33128/0220': 'Auto-merging 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd\nCONFLICT (content): Merge conflict in 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd\nAutomatic merge failed; fix conflicts and then commit the result.\n'}
ERROR: Job failed: exit code 1