From 011684a05fae79aaff2023db7db9e4298a7c4d6d Mon Sep 17 00:00:00 2001 From: Ekagra Ranjan Date: Wed, 1 Jun 2022 05:24:32 +0530 Subject: [PATCH] Fix instruction for cherry pick way of fixing mixed branches (#13186) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Carlos Mocholí --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0519dab2b8..06285ce7ac 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -289,7 +289,7 @@ and the last true master commit is `ccc111` and your first commit is `mmm222`. ```bash git checkout my-branch # create a local backup of your branch - git checkout -b my-branch-backup + git branch my-branch-backup # reset your branch to the correct base git reset release/1.2-dev --hard # ACTION: this step is much easier to do with IDE