Skip to content

Commit 1ce5cd8

Browse files
authored
Merge pull request aws#10056 from kdaily/v2-update-contributing-guide-branch-usage
[v2] Update contrib guide to refer to v2 branch
2 parents edbcec2 + 7f9be03 commit 1ce5cd8

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

CONTRIBUTING.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ contributions as well:
2828
* Code should follow `pep 8 <https://www.python.org/dev/peps/pep-0008/>`__,
2929
although if you are modifying an existing module, it is more important
3030
for the code to be consistent if there are any discrepancies.
31-
* Code must work on ``python2.7``, and ``python3.5`` and higher.
31+
* Code must work on ``python3.9`` and higher.
3232
* The AWS CLI is cross platform and code must work on at least Linux, Windows,
3333
and Mac OS X. Avoid platform specific behavior.
3434
* If you would like to implement support for a significant feature that is not
@@ -43,19 +43,19 @@ Git Commits and Workflow
4343

4444
When sending a pull request, please follow these guidelines:
4545

46-
* The PR should target the ``develop`` branch. If you send a PR to the
47-
``master`` branch, the travis CI jobs will fail.
48-
* Your PR branch should be based off a recent commit of the ``develop`` branch.
46+
* Your PR branch should be based off a recent commit of the ``v2`` branch.
4947
Preferably the base commit for the PR should use the latest commit of
50-
``develop`` at the time the PR was created. This helps to ensure there are
51-
no merge conflicts or test failures when the PR is merged back to the develop
48+
``v2`` at the time the PR was created. This helps to ensure there are
49+
no merge conflicts or test failures when the PR is merged back to the v2
5250
branch.
51+
* The PR should target the ``v2`` branch. A PR against the
52+
``master`` or ``develop`` branch will fail.
5353
* Make separate commits for logically separate changes. Avoid commits such as
5454
"update", "fix typo again", "more updates". Rebase your commits before
5555
submitting your PR to ensure they represent a logical change.
5656
* Avoid merge commits in your PRs. If you want to pull in the latest changes
57-
from the ``develop`` branch, rebase on top of the ``develop`` branch instead
58-
of merging the ``develop`` branch into your feature branch.
57+
from the ``v2`` branch, rebase on top of the ``v2`` branch instead
58+
of merging the ``v2`` branch into your feature branch.
5959

6060
Also, ensure your commit messages match this format::
6161

@@ -96,7 +96,7 @@ can run these commands::
9696
$ cd aws-cli
9797
$ git remote add upstream https://github.com/aws/aws-cli.git
9898
$ git fetch upstream
99-
$ git merge upstream/develop
99+
$ git merge upstream/v2
100100

101101
# Now to create a feature branch:
102102
$ git checkout -b my-branch-name
@@ -111,7 +111,7 @@ can run these commands::
111111
# If we want to sync with the latest upstream changes before
112112
# sending our pull request we can run:
113113
$ git fetch upstream
114-
$ git rebase upstream/develop
114+
$ git rebase upstream/v2
115115

116116
# When you're ready to send a PR, make sure you push your commits
117117
# to your fork:

0 commit comments

Comments
 (0)