You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: contributing/workflow.md
+14-14Lines changed: 14 additions & 14 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -17,7 +17,7 @@ values for when you try these:
17
17
## Branching
18
18
19
19
- 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"__
21
21
22
22
The "master" branch will always contain the latest stable
23
23
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
112
112
is optional, and implies a sort of namespacing if used.
113
113
114
114
- 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"__
116
116
117
117
For instance, if you send a PR to __"develop"__ branch, make sure you are in the *develop* branch, and create a
118
118
new bugfix branch, based on *develop*, for a new feature you are
@@ -124,10 +124,10 @@ creating:
124
124
```
125
125
126
126
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:
128
128
129
129
```console
130
-
> git switch 4.3
130
+
> git switch 4.5
131
131
> git switch -c new/mind-reader
132
132
```
133
133
@@ -267,7 +267,7 @@ On GitHub, you propose your changes one feature branch at a time, by
267
267
switching to the branch you wish to contribute, and then clicking on
268
268
"New pull request".
269
269
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
271
271
may be rejected.
272
272
273
273
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:
308
308
309
309
If you are asked for changes in the review, commit the fix in your branch and push it to GitHub again.
310
310
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*,
312
312
do the following:
313
313
314
314
Synchronize your repository:
@@ -347,7 +347,7 @@ And finally push your local branch to your GitHub repository:
347
347
348
348
If you have sent a PR to the wrong branch, you need to create a new PR branch.
349
349
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"__,
351
351
but you created the PR branch from `develop` and sent a PR.
352
352
353
353
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:
356
356
> git log
357
357
```
358
358
359
-
Update your `4.3` branch:
359
+
Update your __"4.5"__ branch:
360
360
361
361
```console
362
362
> 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
366
366
```
367
367
368
368
(Optional) Create a new branch as a backup, just in case:
@@ -371,10 +371,10 @@ Update your `4.3` branch:
371
371
> git branch feat-abc.bk feat-abc
372
372
```
373
373
374
-
Rebase your PR branch from `develop` onto `4.3`:
374
+
Rebase your PR branch from `develop` onto __"4.5"__:
375
375
376
376
```console
377
-
> git rebase --onto 4.3 develop feat-abc
377
+
> git rebase --onto 4.5 develop feat-abc
378
378
```
379
379
380
380
Force push.
@@ -383,7 +383,7 @@ Force push.
383
383
> git push --force-with-lease origin feat-abc
384
384
```
385
385
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"__.
0 commit comments