You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .github/CONTRIBUTING.md
+6-6Lines changed: 6 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -103,15 +103,15 @@ Great question! The short version goes like this:
103
103
104
104
1.**Switch to the correct branch**
105
105
106
-
Switch to the `v11/contrib` branch
106
+
Switch to the `contrib` branch
107
107
108
108
1.**Build**
109
109
110
110
Build your fork of Umbraco locally as described in the build documentation: you can [debug with Visual Studio Code][build - debugging with code] or [with Visual Studio][build - debugging with vs].
111
111
112
112
1.**Branch**
113
113
114
-
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `v11/contrib`, create a new branch first.
114
+
Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`. Don't commit to `contrib`, create a new branch first.
115
115
116
116
1.**Change**
117
117
@@ -121,7 +121,7 @@ Great question! The short version goes like this:
121
121
122
122
Done? Yay! 🎉
123
123
124
-
Remember to commit to your new `temp` branch, and don't commit to `v11/contrib`. Then you can push the changes up to your fork on GitHub.
124
+
Remember to commit to your new `temp` branch, and don't commit to `contrib`. Then you can push the changes up to your fork on GitHub.
125
125
126
126
#### Keeping your Umbraco fork in sync with the main repository
@@ -138,10 +138,10 @@ Then when you want to get the changes from the main repository:
138
138
139
139
```
140
140
git fetch upstream
141
-
git rebase upstream/v11/contrib
141
+
git rebase upstream/contrib
142
142
```
143
143
144
-
In this command we're syncing with the `v11/contrib` branch, but you can of course choose another one if needed.
144
+
In this command we're syncing with the `contrib` branch, but you can of course choose another one if needed.
145
145
146
146
[More information on how this works can be found on the thoughtbot blog.][sync fork ext]
147
147
@@ -169,7 +169,7 @@ We recommend you to [sync with our repository][sync fork] before you submit your
169
169
GitHub will have picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
170
170

171
171
172
-
We like to use [git flow][git flow] as much as possible, but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `v11/contrib`. If you are working on v9, this is the branch you should be targeting.
172
+
We like to use [git flow][git flow] as much as possible, but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to `contrib`. This is the branch you should be targeting.
173
173
174
174
Please note: we are no longer accepting features for v8 and below but will continue to merge security fixes as and when they arise.
0 commit comments