Skip to content

Commit

Permalink
DOC: Command fixes for release branch merges
Browse files Browse the repository at this point in the history
`git pull` should not have a slash between the remote and branch.

`git push` for the `release` branch update had the wrong branch.
  • Loading branch information
thewtex committed Nov 5, 2024
1 parent 0c6c851 commit 81207a5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Documentation/docs/contributing/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ branches, assuming the topic branch is forked off the `release` branch:

```bash
git checkout release-X.X
git pull --ff-only upstream/release-X.X
git pull --ff-only upstream release-X.X
git merge --no-ff my-topic
git push upstream release-X.X
```
Expand All @@ -339,16 +339,16 @@ then:

```bash
git checkout release
git pull --ff-only upstream/release
git pull --ff-only upstream release
git merge --no-ff release-X.X
git push upstream release-X.X
git push upstream release
```

then:

```bash
git checkout master
git pull --ff-only upstream/master
git pull --ff-only upstream master
git merge --no-ff release
git push upstream master
```
Expand Down

0 comments on commit 81207a5

Please sign in to comment.