Skip to content

Commit 33adbf4

Browse files
Update contributing docs with the correct branch name
1 parent 3a7624c commit 33adbf4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ Great question! The short version goes like this:
103103

104104
1. **Switch to the correct branch**
105105

106-
Switch to the `v11/contrib` branch
106+
Switch to the `contrib` branch
107107

108108
1. **Build**
109109

110110
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].
111111

112112
1. **Branch**
113113

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.
115115

116116
1. **Change**
117117

@@ -121,7 +121,7 @@ Great question! The short version goes like this:
121121

122122
Done? Yay! 🎉
123123

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.
125125

126126
#### Keeping your Umbraco fork in sync with the main repository
127127
[sync fork]: #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:
138138

139139
```
140140
git fetch upstream
141-
git rebase upstream/v11/contrib
141+
git rebase upstream/contrib
142142
```
143143

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.
145145

146146
[More information on how this works can be found on the thoughtbot blog.][sync fork ext]
147147

@@ -169,7 +169,7 @@ We recommend you to [sync with our repository][sync fork] before you submit your
169169
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.
170170
![Create a pull request](img/createpullrequest.png)
171171

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.
173173

174174
Please note: we are no longer accepting features for v8 and below but will continue to merge security fixes as and when they arise.
175175

0 commit comments

Comments
 (0)