Skip to content

Commit

Permalink
Merge pull request #1 from mauvehed/develop
Browse files Browse the repository at this point in the history
docs(DEVELOPERS.md): add branch strategy section to guide development workflow
  • Loading branch information
mauvehed authored Dec 6, 2024
2 parents 77ee191 + 330e330 commit 53a4513
Showing 1 changed file with 54 additions and 0 deletions.
54 changes: 54 additions & 0 deletions docs/DEVELOPERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,57 @@ bun run preview
```

Check out the [deployment documentation](https://nuxt.com/docs/getting-started/deployment) for more information.

## Branch Strategy

We use a simple variation of Git and GitHub Flow for branch control.

### Create and switch to a develop branch

```bash
git checkout -b develop
```

#### Create a feature branch from develop

```bash
git checkout -b feature-branch develop
```

#### Make changes and commit

```bash
git add .

git commit -m "Implement new feature"
```

### Developers

Submit a PR to merge your feature changes to the `develop` branch

### Maintainers

#### Merge feature branch back to develop

```bash
git checkout develop

git merge feature-branch
```

#### When ready for release, merge develop to master

```bash
git checkout master

git merge develop
```

### Tag the release

```bash
git tag -a v1.0 -m "Release version 1.0"

git push origin v1.0
```

1 comment on commit 53a4513

@vercel
Copy link

@vercel vercel bot commented on 53a4513 Dec 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.