frontend / generator-toolbox

:wrench: Toolbox generator | The ultimate frontend generator -
http://frontend.github.io/toolbox
40 stars 4 forks source link

Avoid merge conflicts in main.scss #69

Closed tonifisler closed 7 years ago

tonifisler commented 7 years ago

It happens every time you want to merge a branch into another, and when both of them have received a new component.

Toolbox adds the line in main.scss just after the comment, so a useless merge conflict happens, because Git.

// molecules:
<<<<<<< HEAD
@import 'molecules/teaser-card';
=======
@import 'molecules/fixed-bottom-container';
>>>>>>> master
@import 'molecules/pagination-vertical';
@import 'molecules/teaser-small';