Skip to content

Commit fdc4e92

Browse files
authored
Merge pull request #6154 from codeigniter4/kenjis-patch-1
docs: fix how to update next minor upgrade branch
2 parents 810b0d5 + 72cdccd commit fdc4e92

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

admin/RELEASE.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ Copy the resulting content into **CHANGELOG.md** and adjust the format to match
2424

2525
* Work off direct clones of the repos so the release branches persist for a time
2626
* Clone both **codeigniter4/CodeIgniter4** and **codeigniter4/userguide** and resolve any necessary PRs
27+
```console
28+
git clone [email protected]:codeigniter4/CodeIgniter4.git
29+
git clone [email protected]:codeigniter4/userguide.git
30+
```
2731
* Vet the **admin/** folders for any removed hidden files (Action deploy scripts *do not remove these*)
2832

2933
## CodeIgniter4
@@ -49,10 +53,11 @@ Copy the resulting content into **CHANGELOG.md** and adjust the format to match
4953
* Merge the PR then fast-forward `develop` to catch the merge commit
5054
* Update the next minor upgrade branch `4.x`
5155
```console
52-
git fetch upstream
56+
git fetch origin
5357
git checkout 4.x
54-
git merge upstream/develop
55-
git push upstream HEAD
58+
git merge origin/4.x
59+
git merge origin/develop
60+
git push origin HEAD
5661
```
5762
* Create a new Release:
5863
* Version: "v4.x.x"

0 commit comments

Comments
 (0)