-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathatom.xml
More file actions
136 lines (136 loc) · 7.91 KB
/
Copy pathatom.xml
File metadata and controls
136 lines (136 loc) · 7.91 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<id>https://fehead-studio.github.io</id>
<title>fehead-studio</title>
<updated>2020-09-12T10:17:15.796Z</updated>
<generator>https://github.com/jpmonette/feed</generator>
<link rel="alternate" href="https://fehead-studio.github.io"/>
<link rel="self" href="https://fehead-studio.github.io/atom.xml"/>
<subtitle>fehead官网</subtitle>
<logo>https://fehead-studio.github.io/images/avatar.png</logo>
<icon>https://fehead-studio.github.io/favicon.ico</icon>
<rights>All rights reserved 2020, fehead-studio</rights>
<entry>
<title type="html"><![CDATA[fehead基础建设]]></title>
<id>https://fehead-studio.github.io/post/fehead-ji-chu-jian-she/</id>
<link href="https://fehead-studio.github.io/post/fehead-ji-chu-jian-she/">
</link>
<updated>2020-09-12T10:11:12.000Z</updated>
<content type="html"><</li>
</ol>
<p><code>注：不要在本地主分支开发，保证在pull的时候不会发生冲突</code></p>
<h3 id="commit规范">commit规范</h3>
<p><a href="https://juejin.im/post/6844903606815064077">参考文章</a></p>
<pre><code><type>(<change_name>): <message>
</code></pre>
<p>eg:</p>
<pre><code>feat(fehead_build): add document
</code></pre>
<p>type参照如下：</p>
<pre><code>feat: 新特性
fix: 修改问题
refactor: 代码重构
docs: 文档修改
style: 代码格式修改, 注意不是 css 修改
test: 测试用例修改
chore: 其他修改, 比如构建流程, 依赖管理
</code></pre>
<h3 id="合并代码">合并代码</h3>
<ol>
<li>开发完后<code>commit</code>代码，然后<code>push</code>到个人仓库</li>
<li>向主仓库提<code>pull request</code></li>
<li>找相关成员进行<code>code review</code>(代码检查)</li>
<li>检查通过后由管理员合入仓库</li>
</ol>
<h1 id="文档">文档</h1>
<h2 id="github上新建文档仓库">github上新建文档仓库</h2>
<ol>
<li>由管理员在团队账号上新建文档仓库</li>
<li>文档仓库开放<code>merge</code>权限</li>
<li>每位成员在团队仓库创建一个个人分支，提交个人的文章</li>
<li><code>master</code>分支用于提交基础文档</li>
</ol>
]]></content>
</entry>
<entry>
<title type="html"><![CDATA[共同开发规范]]></title>
<id>https://fehead-studio.github.io/post/gong-tong-kai-fa-gui-fan/</id>
<link href="https://fehead-studio.github.io/post/gong-tong-kai-fa-gui-fan/">
</link>
<updated>2020-09-12T10:01:56.000Z</updated>
<content type="html"><![CDATA[<blockquote>
<p>记一下项目开发的规范，统一开发规范可以有效提高共同开发效率和代码质量<br>
本文档图片的 winsoullin 理解为团队正式发布的仓库，Nightnessss 理解为个人仓库</p>
</blockquote>
<h2 id="fork原项目">Fork原项目</h2>
<p>进入目标仓库，<code>fork</code>项目到自己的仓库<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/fork_0.png" alt="" loading="lazy"></p>
<p><code>fork</code>完后可以再自己的<code>GitHub</code>中找到这个仓库<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/fork_1.png" alt="" loading="lazy"></p>
<h2 id="创建你的主题分支">创建你的主题分支</h2>
<ol>
<li>
<p>将自己<code>GitHub</code>的仓库<code>clone</code>到本地<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/idea_clone_0.png" alt="" loading="lazy"><br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/idea_clone_1.png" alt="" loading="lazy"></p>
</li>
<li>
<p>创建新分支，分支命名尽量与改动需求相关<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/branch_0.png" alt="" loading="lazy"><br>
创建完后可以在<code>local branches</code>看到<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/branch_1.png" alt="" loading="lazy"></p>
</li>
</ol>
<h2 id="代码上传">代码上传</h2>
<ol>
<li>在新建的分支下进行开发</li>
<li>开发完后提交<code>commit</code><br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/commit.png" alt="" loading="lazy"></li>
<li><code>push</code>代码，注意远程仓库为个人仓库，新建与本地分支同名的远程分支<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/push.png" alt="" loading="lazy"></li>
</ol>
<h2 id="发送pull-request">发送Pull Request</h2>
<ol>
<li>在个人仓库选中刚刚提交的分支，点击<code>pull request</code><br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/pull_request_0.png" alt="" loading="lazy"></li>
<li>创建<code>pull request</code>，注意目标仓库分支和源仓库分支<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/pull_request_1.png" alt="" loading="lazy"></li>
<li>提交完后可以在<code>pull request</code>查看信息<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/pull_request_3.png" alt="" loading="lazy"><br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/pull_request_2.png" alt="" loading="lazy"></li>
<li>为这个<code>pull request</code>指定<code>reviewers</code>和<code>assignees</code>，或者直接把连接发给某人，帮你检查合并代码<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/pull_request_4.png" alt="" loading="lazy"></li>
<li>之前都是开发者视角，现在开始是审阅人的视角，审阅人可以在修改的代码段添加评论<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/code_review_0.png" alt="" loading="lazy"></li>
<li>如果代码没问题，可以<code>approve</code>(只有<code>reviewers</code>有<code>approve</code>权限)，并评论<code>LGTM</code>(Look Good To Me[狗头])<br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/code_review_1.png" alt="" loading="lazy"></li>
<li>仓库管理员<code>merge pull request</code><br>
<img src="https://fehead-studio.github.io/post-images/github_ecology/pull_request_5.png" alt="" loading="lazy"></li>
</ol>
<hr>
<p>参考文章: https://blog.csdn.net/yxys01/article/details/78316649</p>
]]></content>
</entry>
</feed>