Skip to content

Commit dee9997

Browse files
committed
Fix 3.2 to 3.3 (#2520)
* to_3.3.md: composer update symfony/flex * to_3.3.md: Use global latest_tag_3_3 (cherry picked from commit 5e324e5)
1 parent af9d4f9 commit dee9997

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

docs/update_and_migration/from_2.5/to_3.3.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
target_version: '3.3'
3-
latest_tag: '3.3.24'
43
---
54

65
# Update the app to v3.3
@@ -52,23 +51,23 @@ Merge the current skeleton into your project:
5251
``` bash
5352
git remote add content-skeleton https://github.com/ibexa/content-skeleton.git
5453
git fetch content-skeleton --tags
55-
git merge v[[= latest_tag =]] --allow-unrelated-histories
54+
git merge v[[= latest_tag_3_3 =]] --allow-unrelated-histories
5655
```
5756

5857
=== "Ibexa Experience"
5958

6059
``` bash
6160
git remote add experience-skeleton https://github.com/ibexa/experience-skeleton.git
6261
git fetch experience-skeleton --tags
63-
git merge v[[= latest_tag =]] --allow-unrelated-histories
62+
git merge v[[= latest_tag_3_3 =]] --allow-unrelated-histories
6463
```
6564

6665
=== "Ibexa Commerce"
6766

6867
``` bash
6968
git remote add commerce-skeleton https://github.com/ibexa/commerce-skeleton.git
7069
git fetch commerce-skeleton --tags
71-
git merge v[[= latest_tag =]] --allow-unrelated-histories
70+
git merge v[[= latest_tag_3_3 =]] --allow-unrelated-histories
7271
```
7372

7473
This introduces changes from the relevant website skeleton and results in conflicts.
@@ -102,9 +101,10 @@ Resolve the conflicts in the following way:
102101

103102
### B. Update the app
104103

105-
Run `composer update` to update the dependencies:
104+
Update Symfony Flex, then update the dependencies:
106105

107106
``` bash
107+
composer update symfony/flex --no-plugins --no-scripts
108108
composer update
109109
```
110110

0 commit comments

Comments
 (0)