File tree Expand file tree Collapse file tree 1 file changed +30
-1
lines changed Expand file tree Collapse file tree 1 file changed +30
-1
lines changed Original file line number Diff line number Diff line change @@ -124,9 +124,38 @@ The maintenance branch's HEAD will be the target for our release tag:
124
124
$ git tag -a -m "Release X.Y.Z" X.Y.Z
125
125
```
126
126
127
- ### Push tags
127
+ ### Update branch-alias for dev-master (major and minor releases only)
128
+
129
+ Initial versions of new major or minor releases will likely be made on the
130
+ master branch directly instead of a maintenance branch. In this case, the
131
+ ` branch-alias ` for ` dev-master ` in ` composer.json ` should be updated. For
132
+ example, after tagging a new 1.10.0 release on the master branch,
133
+ ` composer.json ` in the master branch may still read:
134
+
135
+ ```
136
+ "branch-alias": {
137
+ "dev-master": "1.9.x-dev"
138
+ }
139
+ ```
140
+
141
+ The above would be changed to:
142
+
143
+ ```
144
+ "branch-alias": {
145
+ "dev-master": "1.10.x-dev"
146
+ }
147
+ ```
148
+
149
+ Commit this change:
128
150
129
151
```
152
+ $ git commit -m "Master is now 1.10-dev" composer.json
153
+ ```
154
+
155
+ ### Push commits and tags
156
+
157
+ ```
158
+ $ git push
130
159
$ git push --tags
131
160
```
132
161
You can’t perform that action at this time.
0 commit comments