File tree Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -24,6 +24,10 @@ Copy the resulting content into **CHANGELOG.md** and adjust the format to match
24
24
25
25
* Work off direct clones of the repos so the release branches persist for a time
26
26
* 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
+ ```
27
31
* Vet the ** admin/** folders for any removed hidden files (Action deploy scripts * do not remove these* )
28
32
29
33
## CodeIgniter4
@@ -49,10 +53,11 @@ Copy the resulting content into **CHANGELOG.md** and adjust the format to match
49
53
* Merge the PR then fast-forward ` develop ` to catch the merge commit
50
54
* Update the next minor upgrade branch ` 4.x `
51
55
``` console
52
- git fetch upstream
56
+ git fetch origin
53
57
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
56
61
```
57
62
* Create a new Release:
58
63
* Version: "v4.x.x"
You can’t perform that action at this time.
0 commit comments