mirror of
https://github.com/LadybirdBrowser/ladybird
synced 2026-04-25 17:25:08 +02:00
Documentation: Rephrase git rebase description in beginner's guide
This commit is contained in:
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
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user