One is that the use of git is not standardized.
One is that there is a problem with the allocation of development tasks.
The other is that there is also a problem with project file planning.
(PS: What is the infighting? Companies with few people say that sometimes it is lonely to use git alone. Ah.)

.gitignore Ignore those useless things first, code conflicts are not terrible.

For example, Mac 都有一个文件 .DS_StoreIf you don’t ignore the fact that you and people who use Apple computers pull the code, there will be conflicts.

Don’t have multiple people operating a file at the same time. One or two are fine. If all the front-ends of the company edit it, it will give you a headache when you combine the code.

I don’t know what infighting you are talking about. . .

It’s good if you follow git workflow. Link: https://guides.github.com/int...

Another option: change companies

I think it is a process issue. There must be a person who can review the code, and then push the code. Only after the review is it allowed to be merged into the main branch, and then the local branch is not allowed to be forced to be pushed to the server. There is very useful code. Hosting platform software, such as gitlab, allocates corresponding git permissions, and everyone can work easily