What is the correct way to use git in a team?

Question

git

Hello.
There are 2 situations that I would like to consider.
1) There is a team, let's say 5 people. Everyone writes code and thereby changes files. And there are 5 such versions of one file. Everyone attributed something somewhere, corrected it, and as a result, a severe conflict occurs during merging, and it's hell to sort it all out manually. How should the work of the team with git be organized so that there is a minimum of conflicts?
2) There are 2 people. 1 - writes all code and continues to write it after commits. And the 2nd person - makes minor edits, i.e. somewhere to change the path to the picture, somewhere to change the otsup, in general, on the little things. Is it possible to somehow organize the work so that there are no conflicts at all? Or will the person who writes the main code in the master branch have to make these minor changes manually in case of conflicts?
Thank you)

Answer 1

Conflicts are unlikely to be avoided altogether. In theory, a developer can create a separate branch for each task and, after solving the task, roll out a Pull Request (PR). Moreover, if there is a conflict when creating a PR, the developer rolling out the PR must resolve it. To approve the PR and deploy to master, the team must have a person responsible for this, who monitors the code review.