Skip to content

Commit 35a1dd8

Browse files
committed
docs: update example branch to 4.5
1 parent cbbee76 commit 35a1dd8

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

contributing/pull_request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ working on your contribution.
186186

187187
All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
188188

189-
PRs with any enhancement should be sent to next minor version branch, e.g. __"4.3"__
189+
PRs with any enhancement should be sent to next minor version branch, e.g. __"4.5"__
190190

191191
The __"master"__ branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g. an
192192
emergency security patch) can be applied to the "master" branch to create a new version, without worrying
@@ -276,7 +276,7 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
276276
- If your PR is for bug fixes:
277277
- `> git switch develop`
278278
- `> git switch -c <new-branch-name>`
279-
- If your PR has any enhancement, create new branch from next minor version branch, e.g. __"4.3"__:
279+
- If your PR has any enhancement, create new branch from next minor version branch, e.g. __"4.5"__:
280280
- `> git switch <next-minor-version-branch>`
281281
- `> git switch -c <new-branch-name>`
282282
7. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.

contributing/workflow.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ values for when you try these:
1717
## Branching
1818

1919
- All bug fix PRs should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
20-
- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.3"__
20+
- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.5"__
2121

2222
The "master" branch will always contain the latest stable
2323
version and is kept clean so a "hotfix" (e.g: an emergency security
@@ -112,7 +112,7 @@ This local branch should be named appropriately, for instance
112112
is optional, and implies a sort of namespacing if used.
113113

114114
- All bug fix PRs should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
115-
- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.3"__
115+
- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.5"__
116116

117117
For instance, if you send a PR to __"develop"__ branch, make sure you are in the *develop* branch, and create a
118118
new bugfix branch, based on *develop*, for a new feature you are
@@ -124,10 +124,10 @@ creating:
124124
```
125125

126126
If you send a PR with an enhancement, make sure you are in the *next minor version* branch,
127-
and create a new feature branch, based on, e.g., *4.3*, for a new feature you are creating:
127+
and create a new feature branch, based on, e.g., __"4.5"__, for a new feature you are creating:
128128

129129
```console
130-
> git switch 4.3
130+
> git switch 4.5
131131
> git switch -c new/mind-reader
132132
```
133133

@@ -267,7 +267,7 @@ On GitHub, you propose your changes one feature branch at a time, by
267267
switching to the branch you wish to contribute, and then clicking on
268268
"New pull request".
269269

270-
Make sure the pull request is for the shared __"develop"__ or next minor version branch, e.g. __"4.3"__, or it
270+
Make sure the pull request is for the shared __"develop"__ or next minor version branch, e.g. __"4.5"__, or it
271271
may be rejected.
272272

273273
Make sure that the PR title is helpful for the maintainers and other
@@ -308,7 +308,7 @@ And if your PRs have the breaking changes, label the following label:
308308

309309
If you are asked for changes in the review, commit the fix in your branch and push it to GitHub again.
310310

311-
If the __"develop"__ or next minor version branch, e.g. __"4.3"__, progresses and conflicts arise that prevent merging, or if you are asked to *rebase*,
311+
If the __"develop"__ or next minor version branch, e.g. __"4.5"__, progresses and conflicts arise that prevent merging, or if you are asked to *rebase*,
312312
do the following:
313313

314314
Synchronize your repository:
@@ -347,7 +347,7 @@ And finally push your local branch to your GitHub repository:
347347

348348
If you have sent a PR to the wrong branch, you need to create a new PR branch.
349349

350-
When you have the PR branch `feat-abc` and you should have sent the PR to `4.3`,
350+
When you have the PR branch `feat-abc` and you should have sent the PR to __"4.5"__,
351351
but you created the PR branch from `develop` and sent a PR.
352352

353353
Copy the IDs of any commits you made that you want to keep:
@@ -356,13 +356,13 @@ Copy the IDs of any commits you made that you want to keep:
356356
> git log
357357
```
358358

359-
Update your `4.3` branch:
359+
Update your __"4.5"__ branch:
360360

361361
```console
362362
> git fetch upstream
363-
> git switch 4.3
364-
> git merge upstream/4.3
365-
> git push origin 4.3
363+
> git switch 4.5
364+
> git merge upstream/4.5
365+
> git push origin 4.5
366366
```
367367

368368
(Optional) Create a new branch as a backup, just in case:
@@ -371,10 +371,10 @@ Update your `4.3` branch:
371371
> git branch feat-abc.bk feat-abc
372372
```
373373

374-
Rebase your PR branch from `develop` onto `4.3`:
374+
Rebase your PR branch from `develop` onto __"4.5"__:
375375

376376
```console
377-
> git rebase --onto 4.3 develop feat-abc
377+
> git rebase --onto 4.5 develop feat-abc
378378
```
379379

380380
Force push.
@@ -383,7 +383,7 @@ Force push.
383383
> git push --force-with-lease origin feat-abc
384384
```
385385

386-
On the GitHub PR page, change the base branch to the correct branch `4.3`.
386+
On the GitHub PR page, change the base branch to the correct branch __"4.5"__.
387387

388388
## Cleanup
389389

0 commit comments

Comments
 (0)