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

Release #31

Merged
merged 7 commits into from
Aug 27, 2024
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 app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default function Home() {
return (
<main className="flex min-h-screen flex-col items-center justify-between p-24">
<div>husky test</div>
<div>test husky 123</div>
<div>test husky 1234</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">
Get started by editing&nbsp;
Expand Down
23 changes: 12 additions & 11 deletions docs/BRANCH_MANAGEMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,15 @@ Frequently pull from the main or release branch to stay up-to-date.
- `feature/<feature-name>`
```

- 推荐使用github desktop处理git
- 如果在vscode内使用,推荐gitlens插件
- 可以使用sourcetree来处理
- 选择其一即可,优先github desktop, 有给初学者最人性化的引导
- 除了github desktop的其他工具通常功能更多,比如可视化查看分支的情况。但是bug也可能会更多
- main 分支长期保持稳定,只有每次业务完全开发完成,需要阶段性交付时才从release合并
- main 只能从 doc 或者 release合并. doc不能涉及代码
- release 分支仅合并`feature/*`
- 代码随时可以从主干流向分支, 自行拉取
- 代码定期从分支逐级合并到主干, 需要code review
- main和release 都不能直接写, 只能从分支合并, 如果有不属于现有任何分支的情况,需要先创建一个temp分支在本地, 处理好后分支上传到云端,然后发起pull request -->
- It is recommended to use GitHub Desktop for handling Git operations.
- If using VSCode, the GitLens extension is recommended.
- You can also use Sourcetree for handling Git.
- Choose one of these tools; GitHub Desktop is preferred as it provides the most user-friendly guidance for beginners.
- Other tools besides GitHub Desktop typically offer more features, such as a visual representation of branches. However, they may also come with more bugs.

- The `main` branch should be kept stable over the long term. It should only be merged from the `release` branch when a business feature is fully developed and needs to be delivered.
- The `main` branch should only be merged from the `doc` or `release` branches. The `doc` branch should not contain any code changes.
- The `release` branch should only merge from `feature/*` branches.
- Code can always flow from the main branch to feature branches; developers should pull the latest changes as needed.
- Code should be regularly merged from feature branches back to the main branch, but this requires a code review.
- Direct changes are not allowed on the `main` and `release` branches; changes must be merged through feature branches. If there is a need to make changes that do not belong to any existing branches, a temporary branch should be created locally, and after the changes are made, the branch should be pushed to the remote repository, followed by a pull request.
Loading
Loading