beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 08:11:13 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Documentation: Rephrase git rebase description in beginner's guide

Browse source
This commit is contained in:
circl 2024-08-25 19:52:03 +02:00 committed by Andrew Kaster
parent f1098b4226
commit e47f9d718a
Notes: github-actions[bot] 2024-08-29 02:38:49 +00:00 
Author: https://github.com/circl-lastname
Commit: https://github.com/LadybirdBrowser/ladybird/commit/e47f9d718a0
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1189
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/GettingStartedContributing.md
View file

@ -65,7 +65,7 @@ git push --set-upstream myfork mybranch
git push
```
If your pull request is showing conflicts with the master branch, resolve them locally with:
If you wish to sync your branch with master, or locally resolve merge conflicts, use:
```sh
# On mybranch
git fetch origin