Skip to content

GitLab

Update TS33128Payloads.asn

5 jobs for cr/TS33128/0249 in 1 minute and 48 seconds (queued for 6 seconds)
latest
5a611986
1 related merge request: !90 TS 33.128 CR0249 - N9HR LI and S8HR LI – Part XI (ASN.1 changes)
Status Job ID Name Coverage
  Syntax
passed #13684
checkXSD

00:00:22

passed #13685
parseASN1

00:00:24

 
  Compile And Lint
passed #13686
compileASN1

00:00:22

passed #13687
lintASN1

00:00:21

 
  Merge
failed #13688
MergeTest

00:00:18

 
Name Stage Failure
failed
MergeTest Merge 
Merge OK
cr/TS33128/0220
Merge NOT OK
cr/TS33128/0216
Merge NOT OK
cr/TS33128/0219
Merge OK
Merge conflicts with following branches: {'cr/TS33128/0220': '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/0216': '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