Skip to content

Commit e9a8f09

Browse files
Rename master -> dev
Rename stable -> release
1 parent a1e2e88 commit e9a8f09

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Guidelines for bug reports:
3838
reported.
3939

4040
2. **Check if the issue has been fixed** — try to reproduce it using the
41-
latest `master` or development branch in the repository.
41+
latest `dev` or development branch in the repository.
4242

4343
3. **Isolate the problem** — ideally create an
4444
[SSCCE](http://www.sscce.org/) and a live example.
@@ -113,8 +113,8 @@ included in the project:
113113
2. If you cloned a while ago, get the latest changes from upstream:
114114

115115
```bash
116-
git checkout master
117-
git pull upstream master
116+
git checkout dev
117+
git pull upstream dev
118118
```
119119

120120
3. Create a new topic branch (off the main project development branch) to
@@ -134,7 +134,7 @@ included in the project:
134134
5. Locally merge (or rebase) the upstream development branch into your topic branch:
135135

136136
```bash
137-
git pull [--rebase] upstream master
137+
git pull [--rebase] upstream dev
138138
```
139139

140140
6. Push your topic branch up to your fork:
@@ -144,7 +144,7 @@ included in the project:
144144
```
145145

146146
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
147-
with a clear title and description against the `master` branch.
147+
with a clear title and description against the `dev` branch.
148148

149149

150150
## Code guidelines

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ test:
2323
assemblies: SteveCadwallader.CodeMaid.UnitTests.dll
2424

2525
after_test:
26-
- ps: if ($env:APPVEYOR_REPO_BRANCH -eq 'master' -or $env:APPVEYOR_REPO_BRANCH -eq 'stable') { Vsix-PushArtifacts | Vsix-PublishToGallery }
27-
- ps: if ($env:APPVEYOR_REPO_BRANCH -ne 'master' -and $env:APPVEYOR_REPO_BRANCH -ne 'stable') { Vsix-PushArtifacts }
26+
- ps: if ($env:APPVEYOR_REPO_BRANCH -eq 'dev' -or $env:APPVEYOR_REPO_BRANCH -eq 'release') { Vsix-PushArtifacts | Vsix-PublishToGallery }
27+
- ps: if ($env:APPVEYOR_REPO_BRANCH -ne 'dev' -and $env:APPVEYOR_REPO_BRANCH -ne 'release') { Vsix-PushArtifacts }

0 commit comments

Comments
 (0)