git-terminal: prefer merge over rebase (#14463)

Prefer merge over rebase. This follows the preferred way. Otherwise people will force-push in a PR which is discouraged in the beginning of the page

Co-authored-by: Florian B. <[email protected]>

contributing-guides/git-terminal.md

@@ -57,10 +57,10 @@ There are two ways to update your fork.
 
 ```bash
 git switch main
-git remote add upstream https://github.com/tldr-pages/tldr.git  # only run if you don't already have the upstream remote (check with "git remote -v")
+git remote add upstream https://github.com/tldr-pages/tldr.git # only run if you don't already have the upstream remote (check with "git remote -v")
 git fetch upstream main
-git rebase upstream/main     # in case you have any merge conflicts, click the link below to see how to resolve them
-git push --force-with-lease  # not needed if you only want to update your local repository
+git merge upstream/main # in case you have any merge conflicts, click the link below to see how to resolve them
+git push
 ```
 
 [How to resolve merge conflicts](https://docs.github.com/en/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line)