ci: add descriptive message for merge conflicts (#29215)
ci: add descriptive message for merge conflicts (#29215)

Fix #29199

PR Close #29215

filipesilva/angular,ocombe/angular,juristr/angular,sarunint/angular,wKoza/angular,hansl/angular,gnomeontherun/angular,wKoza/angular,ocombe/angular,brandonroberts/angular,gdi2290/angular,wKoza/angular,manekinekko/angular,mhevery/angular,brandonroberts/angular,angular-indonesia/angular,blesh/angular,mprobst/angular,hansl/angular,matsko/angular,petebacondarwin/angular,gdi2290/angular,mhevery/angular,wKoza/angular,brandonroberts/angular,snaptech/angular,angular-indonesia/angular,blesh/angular,mgechev/angular,mlaval/angular,JiaLiPassion/angular,jasonaden/angular,petebacondarwin/angular,vikerman/angular,alexeagle/angular,sarunint/angular,brandonroberts/angular,petebacondarwin/angular,JiaLiPassion/angular,mlaval/angular,mprobst/angular,IdeaBlade/angular,StephenFluin/angular,mhevery/angular,manekinekko/angular,mhevery/angular,alexeagle/angular,snaptech/angular,jasonaden/angular,IgorMinar/angular,IgorMinar/angular,shairez/angular,alxhub/angular,IgorMinar/angular,mgechev/angular,Brocco/angular,hansl/angular,IgorMinar/angular,filipesilva/angular,Toxicable/angular,mlaval/angular,petebacondarwin/angular,Toxicable/angular,mgechev/angular,matsko/angular,alxhub/angular,Toxicable/angular,JiaLiPassion/angular,hansl/angular,StephenFluin/angular,StephenFluin/angular,blesh/angular,IdeaBlade/angular,gnomeontherun/angular,alexeagle/angular,shairez/angular,alxhub/angular,Brocco/angular,juristr/angular,mlaval/angular,snaptech/angular,gnomeontherun/angular,mlaval/angular,IgorMinar/angular,mprobst/angular,jasonaden/angular,gdi2290/angular,mgechev/angular,Toxicable/angular,StephenFluin/angular,filipesilva/angular,manekinekko/angular,mprobst/angular,Brocco/angular,alexeagle/angular,juristr/angular,alxhub/angular,Brocco/angular,sarunint/angular,angular-indonesia/angular,hansl/angular,hansl/angular,angular/angular,brandonroberts/angular,wKoza/angular,ocombe/angular,brandonroberts/angular,mprobst/angular,snaptech/angular,juristr/angular,IdeaBlade/angular,jasonaden/angular,vikerman/angular,alexeagle/angular,manekinekko/angular,ocombe/angular,sarunint/angular,petebacondarwin/angular,mgechev/angular,petebacondarwin/angular,filipesilva/angular,Toxicable/angular,gnomeontherun/angular,jasonaden/angular,vikerman/angular,Brocco/angular,blesh/angular,gdi2290/angular,matsko/angular,gkalpak/angular,vikerman/angular,wKoza/angular,angular/angular,gdi2290/angular,manekinekko/angular,alexeagle/angular,shairez/angular,filipesilva/angular,matsko/angular,gkalpak/angular,juristr/angular,gkalpak/angular,gkalpak/angular,gdi2290/angular,snaptech/angular,mhevery/angular,IdeaBlade/angular,vikerman/angular,mhevery/angular,StephenFluin/angular,ocombe/angular,IgorMinar/angular,matsko/angular,sarunint/angular,sarunint/angular,manekinekko/angular,jasonaden/angular,snaptech/angular,angular-indonesia/angular,mprobst/angular,vikerman/angular,shairez/angular,Brocco/angular,IdeaBlade/angular,ocombe/angular,alxhub/angular,JiaLiPassion/angular,juristr/angular,shairez/angular,Toxicable/angular,blesh/angular,angular/angular,angular/angular