Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

rename "master" to "main" #247

Merged
merged 1 commit into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Build and test

on:
# Build on pushes to master
# Build on pushes to main
push:
branches:
- master
- main
tags:
# Build pull requests
pull_request:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ News
------------------

- Multiple file input support.
- Rename "master" git branch to "main".


3.0.0 (2021-08-19)
Expand Down
4 changes: 2 additions & 2 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ You can contribute to this project in several ways.

Git branches and their purpose and status at the time of this writing are listed below.

* [master](https://github.com/Pylons/webtest/) - The branch which should always be *deployable*. The default branch on GitHub.
* For development, create a new branch. If changes on your new branch are accepted, they will be merged into the master branch and deployed.
* [main](https://github.com/Pylons/webtest/) - The branch which should always be *deployable*. The default branch on GitHub.
* For development, create a new branch. If changes on your new branch are accepted, they will be merged into the main branch and deployed.

## Prerequisites

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# The encoding of source files.
#source_encoding = 'utf-8-sig'

# The master toctree document.
# The main toctree document.
master_doc = 'index'

# General information about the project.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Or if you want the development version:

.. code-block:: sh

$ pip install https://nodeload.github.com/Pylons/webtest/tar.gz/master
$ pip install https://nodeload.github.com/Pylons/webtest/tar.gz/main

What This Does
==============
Expand Down