I’m having issues when I merge my Maintenance branch which is like QA and merge it to my Main branch which is like PROD. It does not show the changes I’ve made to the Hybrid Phone Sidebar that’s in the Layouts folder. Also it does not update the CSS. Can you help me? Thank you. Sam...
Are you merging in your branch while you are in the mainline? Also, does your modeler console show any conflicts you need to resolve?
In these situations I would use a SVN client like TortoiseSVN to resolve these conflicts. Some styling conflicts are not resolvable within the modeler. See more about resolving with TortoiseSVN here