forked from easzlab/kubeasz
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
12 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,13 +7,13 @@ $ git config --global user.email "[email protected]" | |
$ git config --global user.name "Your Name" | ||
``` | ||
|
||
- 1. 登陆github,在本项目页面点击`fork`到自己仓库 | ||
- 2. clone 自己的仓库到本地:`git clone https://github.com/xxx/kubeasz.git` | ||
- 3. 在 master 分支添加原始仓库为上游分支:`git remote add upstream https://github.com/gjmzj/kubeasz.git` | ||
- 4. 在本地新建开发分支:`git checkout -b dev` | ||
- 5. 在开发分支修改代码并提交:`git add .`, `git commit -am 'xx变更说明'` | ||
- 6. 切换至 master 分支,同步原始仓库:`git checkout master`, `git pull upstream master` | ||
- 7. 切换至 dev 分支,合并本地 master 分支(已经和原始仓库同步),可能需要解冲突:`git checkout dev`, `git merge master` | ||
- 8. 提交本地 dev 分支到自己的远程 dev 仓库:`git push origin dev` | ||
- 9. 在github自己仓库页面,点击`Compare & pull request`给原始仓库发 pull request 请求 | ||
- a. 等待原作者回复(接受/拒绝) | ||
- 1.登陆github,在本项目页面点击`fork`到自己仓库 | ||
- 2.clone 自己的仓库到本地:`git clone https://github.com/xxx/kubeasz.git` | ||
- 3.在 master 分支添加原始仓库为上游分支:`git remote add upstream https://github.com/gjmzj/kubeasz.git` | ||
- 4.在本地新建开发分支:`git checkout -b dev` | ||
- 5.在开发分支修改代码并提交:`git add .`, `git commit -am 'xx变更说明'` | ||
- 6.切换至 master 分支,同步原始仓库:`git checkout master`, `git pull upstream master` | ||
- 7.切换至 dev 分支,合并本地 master 分支(已经和原始仓库同步),可能需要解冲突:`git checkout dev`, `git merge master` | ||
- 8.提交本地 dev 分支到自己的远程 dev 仓库:`git push origin dev` | ||
- 9.在github自己仓库页面,点击`Compare & pull request`给原始仓库发 pull request 请求 | ||
- a.等待原作者回复(接受/拒绝) |