From e47f9d718a04258dbf00b94c8585900a30d56018 Mon Sep 17 00:00:00 2001 From: circl Date: Sun, 25 Aug 2024 19:52:03 +0200 Subject: [PATCH] Documentation: Rephrase `git rebase` description in beginner's guide --- Documentation/GettingStartedContributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/GettingStartedContributing.md b/Documentation/GettingStartedContributing.md index 2cb049c803c..12f8f5a106d 100644 --- a/Documentation/GettingStartedContributing.md +++ b/Documentation/GettingStartedContributing.md @@ -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