Skip to content

Commit a53d99b

Browse files
authored
[UPMERGE] 2.1 -> 2.2 (#46)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/TestApplication/blob/2.0/.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.2 -m "Resolve conflicts between 2.1 and 2.2" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/TestApplication` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
2 parents dab5da3 + d17ecd7 commit a53d99b

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

.github/workflows/upmerge_pr.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
-
2424
base_branch: "2.0"
2525
target_branch: "2.1"
26+
-
27+
base_branch: "2.1"
28+
target_branch: "2.2"
2629

2730
steps:
2831
-

0 commit comments

Comments
 (0)