Skip to content

Commit

Permalink
Merge pull request #23 from DemocracyDevelopers/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
clliu13 authored Aug 19, 2024
2 parents 0f4dc35 + a4128b0 commit fbb7fe2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Image from "next/image";
export default function Home() {
return (
<main className="flex min-h-screen flex-col items-center justify-between p-24">
<div>wow</div>
<div>husky test</div>
<div>test husky 123</div>
<div className="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex">
<p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
Expand Down
22 changes: 11 additions & 11 deletions docs/BRANCH_MANAGEMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@

## 1. Branch Structure Overview

- Main Branch (main)
- Main Branch (`main`)
- Represents the stable version of the project.
- Code must undergo a pull request (PR) and pass code reviews.
- Only merges from:
- release
- doc
- Documentation Branch (doc)
- `release`
- `doc`
- Documentation Branch (`doc`)
- Used exclusively for documentation.
- Cannot merge from any other branches.
- Release Branch (release)
- Release Branch (`release`)
- Contains stable code ready for delivery.
- Code must undergo a pull request (PR) and pass code reviews.
- Only merges from feature/\* branches.
- Feature Branches (feature/\*)
- Only merges from `feature/*` branches.
- Feature Branches (`feature/*`)
- Used for specific feature development.
- Developers pull the latest code from main or release as needed.
- Can be organized as:
- feature/<feature-name>
- feature/<feature-name>-<developer-name>
- `feature/<feature-name>`
- `feature/<feature-name>-<developer-name>`
- Periodically merges into release.
- Test Branches (test/\*)
- Test Branches (`test/*`)
- Used for testing specific aspects of the project.
- Should not merge into any other branch but can receive merges.

> protected branches: main, release
> protected branches: `main`, `release`
## 2. Best Practices

Expand Down

0 comments on commit fbb7fe2

Please sign in to comment.