-
Notifications
You must be signed in to change notification settings - Fork 0
/
14803274002958.html
485 lines (309 loc) · 13.5 KB
/
14803274002958.html
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
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
<!doctype html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>
[實習筆記] 用 Git 和 GitHub 協作的一些注意事項 - My Frontend Note
</title>
<link href="atom.xml" rel="alternate" title="My Frontend Note" type="application/atom+xml">
<link rel="stylesheet" href="asset/css/foundation.min.css" />
<link rel="stylesheet" href="asset/css/docs.css" />
<script src="asset/js/vendor/modernizr.js"></script>
<script src="asset/js/vendor/jquery.js"></script>
<script src="asset/highlightjs/highlight.pack.js"></script>
<link href="asset/highlightjs/styles/github.css" media="screen, projection" rel="stylesheet" type="text/css">
<script>hljs.initHighlightingOnLoad();</script>
<script type="text/javascript">
function before_search(){
var searchVal = 'site:yucj.github.io/logMine ' + document.getElementById('search_input').value;
document.getElementById('search_q').value = searchVal;
return true;
}
</script>
</head>
<body class="antialiased hide-extras">
<div class="marketing off-canvas-wrap" data-offcanvas>
<div class="inner-wrap">
<nav class="top-bar docs-bar hide-for-small" data-topbar>
<section class="top-bar-section">
<div class="row">
<div style="position: relative;width:100%;"><div style="position: absolute; width:100%;">
<ul id="main-menu" class="left">
<li id=""><a target="self" href="index.html">Home</a></li>
<li id=""><a target="_self" href="archives.html">Archives</a></li>
</ul>
<ul class="right" id="search-wrap">
<li>
<form target="_blank" onsubmit="return before_search();" action="http://google.com/search" method="get">
<input type="hidden" id="search_q" name="q" value="" />
<input tabindex="1" type="search" id="search_input" placeholder="Search"/>
</form>
</li>
</ul>
</div></div>
</div>
</section>
</nav>
<nav class="tab-bar show-for-small">
<a href="javascript:void(0)" class="left-off-canvas-toggle menu-icon">
<span> My Frontend Note</span>
</a>
</nav>
<aside class="left-off-canvas-menu">
<ul class="off-canvas-list">
<li><a href="index.html">HOME</a></li>
<li><a href="archives.html">Archives</a></li>
<li><a href="about.html">ABOUT</a></li>
<li><label>Categories</label></li>
<li><a href="git_note.html">Git 筆記</a></li>
<li><a href="javascript_note.html">JS 筆記</a></li>
<li><a href="ES2015.html">ES2015</a></li>
<li><a href="%E5%AF%A6%E7%BF%92%E7%AD%86%E8%A8%98.html">實習筆記</a></li>
<li><a href="Babel.html">Babel</a></li>
<li><a href="Best%20Practices.html">Best Practices</a></li>
<li><a href="Webpack.html">Webpack</a></li>
</ul>
</aside>
<a class="exit-off-canvas" href="#"></a>
<section id="main-content" role="main" class="scroll-container">
<script type="text/javascript">
$(function(){
$('#menu_item_index').addClass('is_active');
});
</script>
<div class="row">
<div class="large-8 medium-8 columns">
<div class="markdown-body article-wrap">
<div class="article">
<h1>[實習筆記] 用 Git 和 GitHub 協作的一些注意事項</h1>
<div class="read-more clearfix">
<span class="date">2016/11/28</span>
<span>posted in </span>
<span class="posted-in"><a href='%E5%AF%A6%E7%BF%92%E7%AD%86%E8%A8%98.html'>實習筆記</a></span>
<span class="comments">
</span>
</div>
</div><!-- article -->
<div class="article-content">
<p><strong>本文目錄：</strong></p>
<ul>
<li>
<a href="#toc_0">一般協作開發操作流程簡介：</a>
<ul>
<li>
<a href="#toc_1">步驟簡述：</a>
<ul>
<li>
<a href="#toc_2">一、複製專案下來本機電腦開始開發：</a>
<ul>
<li>
<a href="#toc_3">1. Fork</a>
</li>
<li>
<a href="#toc_4">2. Git clone</a>
</li>
<li>
<a href="#toc_5">3. Develop on my computer</a>
</li>
<li>
<a href="#toc_6">4. Git push</a>
</li>
<li>
<a href="#toc_7">5. Open a pull request</a>
</li>
</ul>
</li>
<li>
<a href="#toc_8">二、開發中：</a>
</li>
<li>
<a href="#toc_9">三、開發完成後合併到原始專案：</a>
<ul>
<li>
<a href="#toc_10">6. Git fetch</a>
</li>
<li>
<a href="#toc_11">7. Merge with <code>upstream</code>, combine commits</a>
</li>
<li>
<a href="#toc_12">8. Git push --force</a>
</li>
<li>
<a href="#toc_13">9. merge & close the pull request</a>
</li>
</ul>
</li>
</ul>
</li>
</ul>
</li>
<li>
<a href="#toc_14">用 <code>git rebase</code> 整理自己的 commit log</a>
</li>
</ul>
<span id="more"></span><!-- more -->
<h2 id="toc_0">一般協作開發操作流程簡介：</h2>
<pre><code>情境：在 GitHub 上有一個別人的專案，要怎麼加入協作開發？
</code></pre>
<p><img src="media/14803274002958/frontend_note.001.png" alt="frontend_note.001"/></p>
<h3 id="toc_1">步驟簡述：</h3>
<h4 id="toc_2">一、複製專案下來本機電腦開始開發：</h4>
<h5 id="toc_3">1. Fork</h5>
<h5 id="toc_4">2. Git clone</h5>
<h5 id="toc_5">3. Develop on my computer</h5>
<ul>
<li>記得檢查設定 remote 相關設定，讓 <code>git fetch</code> 和 <code>git push</code> 等指令指向正確的目標</li>
</ul>
<h5 id="toc_6">4. Git push</h5>
<h5 id="toc_7">5. Open a pull request</h5>
<h4 id="toc_8">二、開發中：</h4>
<ul>
<li>開發一個小階段就可以再 <code>git push</code> 到 GitHub 上，會自動更新到 PR 內容，在 PR 內進行 code review 和修改</li>
<li>開發中有需要和別人新的開發成果整合時，可使用 <code>git fetch</code>。</li>
<li>不要用 <code>git pull</code> 拉回遠端 <code>upstream</code> 的資料，它會做多餘的事情製造預料之外的麻煩，請用 <code>git fetch</code>。</li>
</ul>
<h4 id="toc_9">三、開發完成後合併到原始專案：</h4>
<ul>
<li>開發完成後要整理 commit log ，並且抓回最新的程式碼作 merge 處理 conflict</li>
</ul>
<h5 id="toc_10">6. Git fetch</h5>
<ul>
<li>不要用 <code>git pull</code> 拉回遠端 upstream 的資料，它會做多餘的事情製造預料之外的麻煩，請用 <code>git fetch</code>。</li>
</ul>
<h5 id="toc_11">7. Merge with <code>upstream</code>, combine commits</h5>
<ul>
<li>整理 commit logs 的相關 <code>git rebase</code> 指令見下節</li>
</ul>
<h5 id="toc_12">8. Git push --force</h5>
<h5 id="toc_13">9. merge & close the pull request</h5>
<h2 id="toc_14">用 <code>git rebase</code> 整理自己的 commit log</h2>
<p>在發 PR（Pull Request）之前，可以用 git rebase 先整理自己的 commits：</p>
<pre><code>git rebase -i e3rji30c <!--整理 e3rji30c 之後的 commits-->
</code></pre>
<p>可參考資料：<br/>
<a href="https://blog.yorkxin.org/2011/07/29/git-rebase">Git-rebase 小筆記 - Yu-Cheng Chuang’s Blog</a></p>
</div>
<div class="row">
<div class="large-6 columns">
<p class="text-left" style="padding:15px 0px;">
<a href="JavaScript-Syntax-about-Condition.html"
title="Previous Post: Level 1: JavaScript 的好用條件語法（JavaScript Best Practice @ Code School）">« Level 1: JavaScript 的好用條件語法（JavaScript Best Practice @ Code School）</a>
</p>
</div>
<div class="large-6 columns">
<p class="text-right" style="padding:15px 0px;">
<a href="ES2015-Syllabus.html"
title="Next Post: 0 ES2015 Syllabus">0 ES2015 Syllabus »</a>
</p>
</div>
</div>
<div class="comments-wrap">
<div class="share-comments">
<div id="disqus_thread"></div>
<script>
/**
* RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
* LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables */
/*
var disqus_config = function () {
this.page.url = PAGE_URL; // Replace PAGE_URL with your page's canonical URL variable
this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
};
*/
(function() { // DON'T EDIT BELOW THIS LINE
var d = document, s = d.createElement('script');
s.src = '//logmine.disqus.com/embed.js';
s.setAttribute('data-timestamp', +new Date());
(d.head || d.body).appendChild(s);
})();
</script>
<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
</div>
</div>
</div><!-- article-wrap -->
</div><!-- large 8 -->
<div class="large-4 medium-4 columns">
<div class="hide-for-small">
<div id="sidebar" class="sidebar">
<div id="site-info" class="site-info">
<h1>My Frontend Note</h1>
<div class="site-des">我的前端筆記</div>
<div class="social">
<a target="_blank" class="rss" href="atom.xml" title="RSS">RSS</a>
</div>
<div style="{width:90%; height:auto; margin: 5px auto 5px auto;}"><img src="http://i.imgur.com/iFetvNZ.jpg?1"></div>
</div>
<div id="site-categories" class="side-item ">
<div class="side-header">
<h2>Categories</h2>
</div>
<div class="side-content">
<p class="cat-list">
<a href="git_note.html"><strong>Git 筆記</strong></a>
<a href="javascript_note.html"><strong>JS 筆記</strong></a>
<a href="ES2015.html"><strong>ES2015</strong></a>
<a href="%E5%AF%A6%E7%BF%92%E7%AD%86%E8%A8%98.html"><strong>實習筆記</strong></a>
<a href="Babel.html"><strong>Babel</strong></a>
<a href="Best%20Practices.html"><strong>Best Practices</strong></a>
<a href="Webpack.html"><strong>Webpack</strong></a>
</p>
</div>
</div>
<div id="site-categories" class="side-item">
<div class="side-header">
<h2>Recent Posts</h2>
</div>
<div class="side-content">
<ul class="posts-list">
<li class="post">
<a href="14988019613600.html">Webpack 2 & 3: Input(Entry) and Output</a>
</li>
<li class="post">
<a href="14987956627714.html">[NodeJS] Path, URL 路徑相關問題整理</a>
</li>
<li class="post">
<a href="14987306644790.html">Webpack plugins and loaders I used</a>
</li>
<li class="post">
<a href="14987255686752.html">Babel plugins and loaders I used</a>
</li>
<li class="post">
<a href="14971940142851.html">Webpack 2: deploy</a>
</li>
</ul>
</div>
</div>
</div><!-- sidebar -->
</div><!-- hide for small -->
</div><!-- large 4 -->
</div><!-- row -->
<div class="page-bottom clearfix">
<div class="row">
<p class="copyright">Copyright © 2015
Powered by <a target="_blank" href="http://www.mweb.im">MWeb</a>,
Theme used <a target="_blank" href="http://github.com">GitHub CSS</a>.</p>
</div>
</div>
</section>
</div>
</div>
<script src="asset/js/foundation.min.js"></script>
<script>
$(document).foundation();
function fixSidebarHeight(){
var w1 = $('.markdown-body').height();
var w2 = $('#sidebar').height();
if (w1 > w2) { $('#sidebar').height(w1); };
}
$(function(){
fixSidebarHeight();
})
$(window).load(function(){
fixSidebarHeight();
});
</script>
<script src="asset/chart/all-min.js"></script><script type="text/javascript">$(function(){ var mwebii=0; var mwebChartEleId = 'mweb-chart-ele-'; $('pre>code').each(function(){ mwebii++; var eleiid = mwebChartEleId+mwebii; if($(this).hasClass('language-sequence')){ var ele = $(this).addClass('nohighlight').parent(); $('<div id="'+eleiid+'"></div>').insertAfter(ele); ele.hide(); var diagram = Diagram.parse($(this).text()); diagram.drawSVG(eleiid,{theme: 'simple'}); }else if($(this).hasClass('language-flow')){ var ele = $(this).addClass('nohighlight').parent(); $('<div id="'+eleiid+'"></div>').insertAfter(ele); ele.hide(); var diagram = flowchart.parse($(this).text()); diagram.drawSVG(eleiid); } });});</script>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><script type="text/x-mathjax-config">MathJax.Hub.Config({TeX: { equationNumbers: { autoNumber: "AMS" } }});</script>
</body>
</html>