Skip to content

Commit 3f0714d

Browse files
authored
chore: update release-it json (#55)
* docs: update the condition for rebase on dev and explain * chore: update release-it json
1 parent c36da8c commit 3f0714d

5 files changed

+14
-10
lines changed

.release-it.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"publish": false
1616
},
1717
"hooks": {
18-
"after:bump": "prettier --write CHANGELOG.md && git add CHANGELOG.md ",
18+
"before:release": "prettier --write CHANGELOG.md && git add CHANGELOG.md ",
1919
"after:release": "git checkout master && git push origin master:stable-v${version} || true && echo 更新版本 ${version} 成功!"
2020
},
2121
"plugins": {

CHANGELOG.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
2-
31
## [1.0.9-4](https://github.com/wh131462/leetcode-practice/compare/cli-v1.0.9-3...cli-v1.0.9-4) (2024-03-14)
42

5-
63
### Features
74

8-
* ora loading ([#54](https://github.com/wh131462/leetcode-practice/issues/54)) ([b604316](https://github.com/wh131462/leetcode-practice/commit/b6043167752a74582e8d095721cf5b3849951e06))
5+
- ora loading ([#54](https://github.com/wh131462/leetcode-practice/issues/54)) ([b604316](https://github.com/wh131462/leetcode-practice/commit/b6043167752a74582e8d095721cf5b3849951e06))
96

107
## [1.0.9-3](https://github.com/wh131462/leetcode-practice/compare/cli-v1.0.9-2...cli-v1.0.9-3) (2024-03-14)
118

CONTRIBUTORS.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ Do not develop on the `master` branch. The `master` branch is only for merging p
1414

1515
After completing development and committing on the `dev` branch or a `feat-xxx` branch, please use `git rebase origin/master` for local merging. After resolving all code conflicts locally, submit a pull request to members with permission for timely merging.
1616

17-
## 3. About Feature and Dev Branches
17+
## 3. About Feature Branches and Dev Branch
1818

19-
By default, feature and fix branches will be deleted after being merged into `master` via pull request.
19+
By default, after submitting a pull request (PR), feature branches and fix branches will be deleted upon merging into the `master` branch.
2020

21-
The `dev` branch will not be deleted.
21+
The `dev` branch, however, will not be deleted. During development on this branch, please synchronize the main branch by performing `git rebase master` beforehand. This is because the `master` branch accepts merges from feature branches and fix branches, potentially causing the `master` branch to be ahead of the `dev` branch.
22+
23+
## 4. Rebase Synchronization Procedure
24+
25+
When synchronizing with the main repository using `rebase` to resolve conflicts, after resolving conflicts, you may notice indicators such as `pull [number]` and `push [number]` when using `git status`. These indicate the number of commits behind and ahead of the remote branch, respectively. This is a normal situation resulting from `rebase`. At this point, you need to execute `git push -f` to perform a forced push to the remote branch, ensuring synchronization with the `master` branch and avoiding unnecessary commits.
2226

2327
## References
2428

CONTRIBUTORS_CN.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818

1919
默认`特性分支``修复分支`提交`pr`合并到`master`之后,会进行`删除`分支.
2020

21-
`dev`分支不会进行删除.
21+
`dev`分支不会进行删除,但是在其上开发的时候,请先进行`git rebase master`同步主分支(因为`主分支`接受`特性分支``修复分支``合并`,所以会出现`master分支`早于`dev分支`的情况).
22+
23+
## 4. rebase同步操作说明
24+
25+
在进行对`主仓库的同步`的时候,使用`rebase`解决完成`冲突`之后,使用`git status`你会发现出现`pull [数字]``push [数字]`标识,其含义为`落后``领先`远程分支的记录数, 这种是`rebase`产生的`正常情况`,在这个时候需要执行`git push -f`对远端进行`强制推送`,实现`同步`master分支,就不会产生多余的commit了.
2226

2327
## 参考信息
2428

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "leetcode-practice",
33
"type": "module",
44
"version": "1.0.9-4",
5-
"packageManager": "yarn@1.22.0",
65
"description": "A powerful practice platform for leetcode.Using any way you want to create questions.",
76
"author": {
87
"name": "EternalHeart",

0 commit comments

Comments
 (0)