Skip to content

Commit

Permalink
Switch to main branch based development
Browse files Browse the repository at this point in the history
  • Loading branch information
dbast committed Nov 22, 2023
1 parent 9f54435 commit aa11ed4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
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
19 changes: 6 additions & 13 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.
(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

0 comments on commit aa11ed4

Please sign in to comment.