File tree Expand file tree Collapse file tree 2 files changed +7
-17
lines changed
system/ThirdParty/Escaper/Exception Expand file tree Collapse file tree 2 files changed +7
-17
lines changed Original file line number Diff line number Diff line change @@ -363,28 +363,16 @@ Update your `4.3` branch:
363
363
> git push origin 4.3
364
364
```
365
365
366
- Create a new branch ` feat-ab.new ` from the correct branch ` 4.3 ` :
367
-
368
- ``` console
369
- > git switch -c feat-abc.new 4.3
370
- ```
371
-
372
- Cherry-pick the commits you did:
373
-
374
- ``` console
375
- > git cherry-pick < commit_id> < commit_id> < commit_id> ...
376
- ```
377
-
378
- Rename the PR branch ` feat-abc ` :
366
+ (Optional) Create a new branch as a backup, just in case:
379
367
380
368
``` console
381
- > git branch -m feat-abc feat-abc.old
369
+ > git branch feat-abc.bk feat-abc
382
370
```
383
371
384
- Rename the new branch ` feat-abc.new ` to ` feat-abc ` .
372
+ Rebase your PR branch from ` develop ` onto ` 4.3 ` :
385
373
386
374
``` console
387
- > git branch -m feat-abc.new feat-abc
375
+ > git rebase --onto 4.3 develop feat-abc
388
376
```
389
377
390
378
Force push.
Original file line number Diff line number Diff line change 4
4
5
5
namespace Laminas \Escaper \Exception ;
6
6
7
- interface ExceptionInterface
7
+ use Throwable ;
8
+
9
+ interface ExceptionInterface extends Throwable
8
10
{
9
11
}
You can’t perform that action at this time.
0 commit comments