Skip to content

Commit ac173f0

Browse files
doc: remove mention of the v2 branch
1 parent 40390c7 commit ac173f0

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To submit code:
5252
- Create a topic branch from where you want to base your work (usually master)
5353
- Add tests to cover contributed code
5454
- Push your commit(s) to your topic branch on your fork
55-
- Open a pull request against `scaleway-cli` `v2` branch that follows [PR guidelines](#pull-request-guidelines)
55+
- Open a pull request against `scaleway-cli` `master` branch that follows [PR guidelines](#pull-request-guidelines)
5656

5757
The [maintainers](MAINTAINERS.md) of `scaleway-cli` use a "Let's Get This Merged" (LGTM) message in the pull request to note that the commits are ready to merge.
5858
After one or more maintainer states LGTM, we will merge.
@@ -73,9 +73,7 @@ The goal of the following guidelines is to have Pull Requests (PRs) that are fai
7373
- **Please, keep us updated.**
7474
We will try our best to merge your PR, but please notice that PRs may be closed after 30 days of inactivity.
7575

76-
Your pull request should be rebased against the current `v2` branch. Please do not merge
77-
the current `v2` branch in with your topic branch, nor use the Update Branch button provided
78-
by GitHub on the pull request page.
76+
Your pull request should be rebased against the `master` branch.
7977

8078
Keep in mind only the **pull request title** will be used as commit message as we stash all commits on merge.
8179

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!--- If your PR fully resolves and should automatically close the linked issue, use Closes. Otherwise, use Relates --->
99
Relates OR Closes #0000
1010

11-
Release note for [CHANGELOG](https://github.com/scaleway/scaleway-cli/blob/v2/CHANGELOG.md):
11+
Release note for [CHANGELOG](https://github.com/scaleway/scaleway-cli/blob/master/CHANGELOG.md):
1212
<!--
1313
If the change is not user facing, just write "NONE" in the release-note block below.
1414
-->

0 commit comments

Comments
 (0)