Question

How to resolve CSS conflicts in theme folder

1

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.

asked 2022-03-10

Kokila Bathala

1 answers

Marius van der Knaap · Answer 1 · 2022-03-10

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.