Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Switch to main branch based development #309

Merged
merged 1 commit into from
Nov 22, 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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Pull requests

Make sure to make your pull requests against the `develop` branch.
Make sure to make your pull requests against the `main` branch.

## Build

Expand Down
21 changes: 7 additions & 14 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Release

- Update dependencies and fix any outdated dependencies.
- Update dependencies and fix any outdated dependencies. (can be skipped as
Dependabot keeps everything updated)

```bash
npm install -g npm-check-updates
Expand All @@ -16,22 +17,14 @@ npm-check-updates

- Run the [build](./CONTRIBUTING.md#build).

- All contributions currently go to the `develop` branch. To make a new
releasecheckout to the `main` branch and merge with `develop` and then proceed
with the release process. We also keep the `master` branch until `v3` is
released with a wrtning so we also merge this with develop.
- We keep the `master` branch until `v3` is released with a warning so we also
merge this with main.

```bash
git checkout develop
git pull origin develop
git checkout master
git pull origin master
git merge develop
git remote update
git checkout origin/master -b master
git merge origin/main
git push origin master
git checkout main
git pull origin main
git merge develop
git push origin main
```

- Create a new named tag:
Expand Down
Loading