Question

Conflict in custom scss file.

1

Hello Guys, I am getting this conflict when I am committing my branch line, even though the content of the style sheets are same as the other branches. Could you please help me in this.

asked 2022-08-12

Sudhanshu Dhyani

3 answers

Thangaselvan S · Answer 1 · 2022-08-12

Hi Sudhanshu,

As Ragul raj said, use SVN to resolve conflicts.

Go to the themesource→ right click and resolve the conflicts

Ragul raj · Answer 2 · 2022-08-12

Hi Sudhanshu Dhyani,

By using tortoise SVN we can able to resolve,

Go to the project directory Right click and give resolve.

Steffy D · Answer 3 · 2022-08-12

Hi Sudhanshu,

Try to open the file and check for conflicts. if u think you already resolved conflicts using notepad, Go to App → Synchronize App directory to synchronize it.