If you prefer to rebase your local changes on top of the remote branch, you can use the rebase strategy. This essentially replays your local commits on top of the incoming remote changes. To use this strategy, you can run the following command before pulling:

git config pull.rebase true

If you want to pull without rebase then

git config pull.rebase false