Skip to content

Commit

Permalink
Rename master -> dev
Browse files Browse the repository at this point in the history
Rename stable -> release
  • Loading branch information
codecadwallader committed Jan 2, 2021
1 parent a1e2e88 commit e9a8f09
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Guidelines for bug reports:
reported.

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

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

```bash
git checkout master
git pull upstream master
git checkout dev
git pull upstream dev
```

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

```bash
git pull [--rebase] upstream master
git pull [--rebase] upstream dev
```

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

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


## Code guidelines
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ test:
assemblies: SteveCadwallader.CodeMaid.UnitTests.dll

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

0 comments on commit e9a8f09

Please sign in to comment.