lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-04-29 23:24:55 +02:00
Code Activity

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

Browse source 
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. <gn0mish@protonmail.com>
This commit is contained in:
Sebastiaan Speck 2024-10-30 19:22:21 +01:00 • committed by GitHub
parent 9e18978be5
commit 362d958731
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contributing-guides/git-terminal.md
View file

@ -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)