Strange commits on github Merge branch 'master' of github.com:project_name

Question

git

person 2 pull
person 1 made a push (several commits)
person 2 commit
person 2 pull
person 2 push

and an entry about the Merge branch 'master' of github.com:project_name appears in the log
in which there are a lot of changes that neither one nor the other made a person, and which were made a long time ago by a person 3.

The situation repeats itself regularly when there is > 1 developer

Such commits spoil the commit tape very much and

we do not use brunches to track the history of files.

The question is, how can such records be avoided?

Thank you.

Answer 1

instead of:
person 2 pull
use:
person 2 pull --rebase
If there are conflicts, fix them and call
git rebase --continue
Well, I would advise you to take the time and read progit.org/book/