Pipeline · SA3 / SA3LI Trial

Resolving merge conflict

5 jobs for cr/33128/0272 in 1 minute and 49 seconds (queued for 4 seconds)

Status	Job ID	Name
Syntax
passed	#16436	checkXSD	00:00:24 Nov 08, 2021
passed	#16437	parseASN1	00:00:24 Nov 08, 2021

Compile And Lint
passed	#16438	compileASN1	00:00:22 Nov 08, 2021
passed	#16439	lintASN1	00:00:22 Nov 08, 2021

Merge
failed	#16440	MergeTest	00:00:16 Nov 08, 2021

Name Stage Failure

	Name	Stage	Failure
failed	MergeTest	Merge
	`Target branch is meeting/SA94e Searching for open MRs targeting same branch... 2 MRs found cr/33128/0264 Merge OK cr/33128/0258 Merge NOT OK Merge conflicts with following branches: {'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`

failed

MergeTest

Merge

Target branch is meeting/SA94e
Searching for open MRs targeting same branch...
2 MRs found
cr/33128/0264
Merge OK
cr/33128/0258
Merge NOT OK
Merge conflicts with following branches: {'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