mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-18 17:25:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #789 from hedgedoc/docs/branch_confusion

Browse source
This commit is contained in:
Yannick Bungers 2021-02-01 22:21:39 +01:00 • committed by GitHub
commit 5299cfb0c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/pull_request_template.md vendored
View file

@ -12,7 +12,9 @@ This PR fixes/adds/improves/...
- [ ] Added / updated tests - [ ] Added / updated tests
- [ ] Added / updated documentation - [ ] Added / updated documentation
- [ ] I read the [contribution documentation](https://github.com/hedgedoc/hedgedoc/blob/develop/CONTRIBUTING.md) and - [ ] I read the [contribution documentation](https://github.com/hedgedoc/hedgedoc/blob/develop/CONTRIBUTING.md) and
signed-off my commits to accept the DCO. made sure that:
- My commits are signed-off to accept the DCO.
- This PR targets the correct branch: `master` for 1.x & docs, `develop` for 2.x
### Related Issue(s) ### Related Issue(s)
<!-- e.g #123 --> <!-- e.g #123 -->

6
CONTRIBUTING.md
View file

@ -35,6 +35,10 @@ Please note we have a [code of conduct][code-of-conduct], please follow it in al
* Please note that we only accept PRs for the 1.x releases if they fix critical issues. If you are unsure if your fix is * Please note that we only accept PRs for the 1.x releases if they fix critical issues. If you are unsure if your fix is
critical, it's best to ask us before you start coding. critical, it's best to ask us before you start coding.
* **Choose the correct base branch:**
The code for 1.x lives in the `master` branch. docs.hedgedoc.org is also deployed from there until 2.0 is released.
HedgeDoc 2.x is developed in the `develop` branch.
### Do you intend to add a new feature or change an existing one? ### Do you intend to add a new feature or change an existing one?
* Suggest your idea via a new GitHub issue. After a confirmation about your idea, you can start writing code. Our * Suggest your idea via a new GitHub issue. After a confirmation about your idea, you can start writing code. Our
@ -72,7 +76,7 @@ like `git config --global alias.ci 'commit -s'`. Now you can commit with `git ci
1. Submit an issue describing your proposed change. We will try to respond to your issue promptly. 1. Submit an issue describing your proposed change. We will try to respond to your issue promptly.
2. Fork this repo, develop and test your code changes. Ensure you follow the commit guidelines (see below) 2. Fork this repo, develop and test your code changes. Ensure you follow the commit guidelines (see below)
and signed all your commits (see above for details). and signed all your commits (see above for details).
3. Submit a pull request against this repo's `develop` branch. 3. Submit a pull request against this repo's `develop` branch for 2.x or the `master` branch for 1.x.
4. Your branch may be merged once all configured checks pass. 4. Your branch may be merged once all configured checks pass.
### Commit guidelines ### Commit guidelines

6
README.md
View file

@ -18,10 +18,10 @@ HedgeDoc 2
HedgeDoc lets you create real-time collaborative markdown notes. Have a look at [our website](https://hedgedoc.org) for HedgeDoc lets you create real-time collaborative markdown notes. Have a look at [our website](https://hedgedoc.org) for
more details. more details.
**Important:** We are currently working on HedgeDoc 2, a complete rewrite of HedgeDoc. Please note the following: ⚠️⚠️⚠️ **Important:** We are currently working on HedgeDoc 2, a complete rewrite of HedgeDoc. Please note the following:
- This branch contains the latest development code and does not implement all features yet. If you are looking for the - This branch contains the latest development code and does not implement all features yet. **If you are looking for the
1.x source code, have a look at the `master` branch. 1.x source code, have a look at the `master` branch.**
- HedgeDoc 2 will be split in two components: the backend (this repo) and the frontend in - HedgeDoc 2 will be split in two components: the backend (this repo) and the frontend in
the [react-client repo](https://github.com/hedgedoc/react-client). the [react-client repo](https://github.com/hedgedoc/react-client).
- The 1.x release is maintenance-only. We do not accept feature requests or PRs for this release anymore and may choose - The 1.x release is maintenance-only. We do not accept feature requests or PRs for this release anymore and may choose