Merged "brunch-2" with master-brunch. A lot of conflicts came out - in manual profixil. Now, in status, it says that the branches are identical, but when I launch the application with master: a, I get an error Invalid CSS after "}": expected "}", was "" , and when I do a checkout and start with branch-2, all works fine. Although with curly brackets there seems everything is in order. Somewhere I read that the problem is in sass. In the file styles (custom.css.scss) 3500 lines, how to identify where errors?

  • one
    Well, if you have minimized it, look at the line number and with an error, and look for something missing } - surely some nested style fails - lexxl
  • one
    Make a diff between the branches, look where the bracket disappeared - Mal Skrylev
  • Thanks, diff helped. - lif3ar

1 answer 1

team

 $ git diff ветка-1 ветка-2

It should show the differences in the files between the branches.

among these differences, it will be possible to find the missing parenthesis.