Skip to content

GitLab

From s3i210362

5 jobs for cr/TS33128/0201 in 1 minute and 23 seconds (queued for 1 second)
latest
b9dd5e87
1 related merge request: !70 Li for NEF Services including NIDD in TS 33.128
Status Job ID Name Coverage
  Syntax
passed #10922
checkXSD

00:00:14

passed #10923
parseASN1

00:00:19

 
  Compile And Lint
passed #10924
compileASN1

00:00:16

passed #10925
lintASN1

00:00:16

 
  Merge
failed #10926
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/0202': '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/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', '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