Skip to content

GitLab

More corrections...

5 jobs for cr/TS33128/0171 in 1 minute and 20 seconds (queued for 2 seconds)
latest
c403f6af
1 related merge request: !59 LI for NIDD in 5GS in TS 33.128
Status Job ID Name Coverage
  Syntax
passed #9179
checkXSD

00:00:13

passed #9180
parseASN1

00:00:18

 
  Compile And Lint
passed #9181
compileASN1

00:00:16

passed #9182
lintASN1

00:00:16

 
  Merge
failed #9183
MergeTest

00:00:14

 
Name Stage Failure
failed
MergeTest Merge 
Merge OK
cr/TS33128/0173
Merge NOT OK
cr/TS33128/0166
Merge OK
cr/TS33128/0165
Merge OK
Merge conflicts with following branches: {'cr/TS33128/0196': '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/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/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'}
ERROR: Job failed: exit code 1