Browse Source

`dev` out, `beta` in

pull/549/head 3.16
Hristos N. Triantafillou 10 months ago
parent
commit
81b4893382
Signed by: hristoast GPG Key ID: 5FC7664AD47AA1C5
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      CONTRIBUTING.md
  2. +1
    -1
      PULL_REQUEST_TEMPLATE.md

+ 3
- 3
CONTRIBUTING.md View File

@ -97,9 +97,9 @@ Any commit to any branch on the primary `Modding-OpenMW.com/momw` repository wil
## Contributing/Submitting changes
* Check out a new branch based on `dev` and name it to what you intend to do:
* Check out a new branch based on `beta` and name it to what you intend to do:
$ git checkout -b my-cool-feature origin/dev
$ git checkout -b my-cool-feature origin/beta
* Use one branch per fix/feature
* Make your changes
@ -109,7 +109,7 @@ Any commit to any branch on the primary `Modding-OpenMW.com/momw` repository wil
* Please provide a git message that explains what you've done.
* Commit to a forked repository on our Gitea instance.
* Make a pull request
* Make sure you send the PR to the `dev` branch.
* Make sure you send the PR to the `beta` branch.
* A passing [Buildbot build](https://buildbot.modding-openmw.com/) is required before any changes are merged.
Tests are expected for any submitted changes. If it's specific to a particular page, or adds a new page, related selenium tests should be written.

+ 1
- 1
PULL_REQUEST_TEMPLATE.md View File

@ -3,7 +3,7 @@
Please review the [guidelines for contributing](CONTRIBUTING.md) to this repository.
* [ ] Make sure you are requesting to **pull a topic/feature/bugfix branch** (right side). Don't request your master!
* [ ] Make sure you are making a pull request against the **dev branch** (left side). Also you should start *your branch* off *our dev*.
* [ ] Make sure you are making a pull request against the **beta branch** (left side). Also you should start *your branch* off *our dev*.
* [ ] Check the commit's or even all commits' message styles matches our requested structure.
* [ ] Check your code additions will fail neither code linting checks nor unit test.
* [ ] If you've added a page, function, or any other content, there is sufficient test coverage.


Loading…
Cancel
Save