Skip to content

GitLab

Update 33128/r17/TS33128Payloads.asn

5 jobs for cr/33128/0276 in 2 minutes and 3 seconds (queued for 2 seconds)
7632ef85
1 related merge request: !116 TS 33.128 CR0276 - RCS Stage 3 Registration, Message and Session establishment LI messages
Status Job ID Name Coverage
  Syntax
passed #16105
checkXSD

00:00:33

passed #16106
parseASN1

00:00:26

 
  Compile And Lint
passed #16107
compileASN1

00:00:22

passed #16108
lintASN1

00:00:22

 
  Merge
failed #16109
MergeTest

00:00:19

 
Name Stage Failure
failed
MergeTest Merge 
Merge OK
cr/33128/0257
Merge OK
cr/33128/0258
Merge NOT OK
cr/33128/0261
Merge OK
Merge conflicts with following branches: {'cr/33128/0273': '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/33128/0258': '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