mirror of
https://github.com/fergalmoran/ladybird.git
synced 2025-12-22 09:19:03 +00:00
Documentation: Rephrase git rebase description in beginner's guide
This commit is contained in:
@@ -65,7 +65,7 @@ git push --set-upstream myfork mybranch
|
|||||||
git push
|
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
|
```sh
|
||||||
# On mybranch
|
# On mybranch
|
||||||
git fetch origin
|
git fetch origin
|
||||||
|
|||||||
Reference in New Issue
Block a user