Do i have to manually fix Scss files after every merge? Merge conflict

0
Hi   We have multiple feature branches, but whenever we update from the mainline, or commit to the mainline, we then need to use SmartSVN and WinMerge to manually resolve the conflicts (I think it is due to how much editing we are doing in Scss files).   is there a smarter, less tedious way to do this?    
asked
1 answers
2

Smarter way is to keep you scss-files pretty small. Cut them up into separate smaller scss-files, as soon as you can think of a plausible reason. The smaller they are, the less likely that they are causing a conflict.

Also: Commit often. The more often you commit, the less likely a conflict occurs.

answered