mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 17:10:53 +00:00
[UPMERGE] 1.14 -> 2.0 (#16194)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/2.0 -m "Resolve conflicts between 1.14 and 2.0" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
This commit is contained in:
commit
5daae8cc43
1 changed files with 3 additions and 0 deletions
3
.github/workflows/upmerge_pr.yaml
vendored
3
.github/workflows/upmerge_pr.yaml
vendored
|
|
@ -25,6 +25,9 @@ jobs:
|
|||
target_branch: "1.13"
|
||||
-
|
||||
base_branch: "1.13"
|
||||
target_branch: "1.14"
|
||||
-
|
||||
base_branch: "1.14"
|
||||
target_branch: "2.0"
|
||||
-
|
||||
base_branch: "2.0"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue