Skip to content

Commit d4d2b7a

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

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
@@ -28,6 +28,9 @@ jobs:
2828
target_branch: "2.1"
2929
-
3030
base_branch: "2.1"
31+
target_branch: "2.2"
32+
-
33+
base_branch: "2.2"
3134
target_branch: "3.0"
3235

3336
steps:

0 commit comments

Comments
 (0)