How to resolve Sass/sourcemapce conflict in git?

Question

PHP

Good afternoon! I have the following question.
There are two front-end developers on the project, respectively, two write css (in this case, sass), in sass there are sourcemaps that always conflict in git. Please tell me how this problem is solved, how to add this part to ignore? (deleting sourcemaps is not an option)
Or how is this organized correctly on a large project?
I would be very grateful for your help!

Answer 1

I did this: $array = $arr2+$arr, i.e. merged backwards, $arr2overwrites $arr, I need it that way.
I don't know how correct this is, but it works.

Answer 2

array_merge($arr, $arr2);

Answer 3

array_merge_recursive

Answer 4

Add file to .gitignore?

Answer 5

Please tell me how this problem is solved, how to add this part to ignore?

Create a .gitignore file and add everything unnecessary there, incl. CSS, SourceMaps and all other auto-generated nonsense. Resp. after that, remove s.map from the repository history (completely).
In production, or before submitting a layout for review, deployment, or similar events, all the necessary files (usually this refers to CSS, not s.map) are collected / generated either by the last developer (who submits), or any build system that you are using.