How to resolve CSS conflicts in theme folder

Dear All, I am using mendix 9.9.0 version for my project which is in Git server respository, while I m merging the code from Masterline to a feature branch I encounter some CSS conflicts on one of my custom scss pages. I have resolved it using VS code by accepting the ”both changes” option. Still I see some error in one of the compiler files to which I can’t able to resolve. Can someone help me with the solution? Thanks in advance.
1 answers

Hi Kokila,

Perhaps something went wrong during the merge. It’s best to check the files that the error is referring to and investigate if there’s any wrong SCSS in there.