Git is full of shorthands like in CSS. Did you know pull is not one of the basic commands?

pull = fetch + merge

So you can modify its behaviour more aware.

By default, it runs fetch followed by merge, e.g. start merging your main with the fetched main on the index. Can potentially get into a conflict state like on any merge.

Modify at first you pull command with...

◾ --rebase, it runs git rebase instead of git merge.

◾ --ff don't even start the merge if there's any conflict (useful with repos at not-clean state).

Modify at first you pull command with...

◾ --force inverse of the commonly described "push force" 😉.

◾ --no-commit start the merge but left the possible needed commit to you.