-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathch14.html
More file actions
1977 lines (1806 loc) · 77.4 KB
/
ch14.html
File metadata and controls
1977 lines (1806 loc) · 77.4 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
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
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Ch.14 Git & 버전관리 | CS Visualizer</title>
<link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@300;400;500;600;700&family=Noto+Sans+KR:wght@300;400;500;700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="style.css">
<style>
/* ── Ch14 accent ─────────────────────────── */
:root { --ch14: #06b6d4; --ch14-dim: rgba(6,182,212,0.15); --ch14-glow: 0 0 20px rgba(6,182,212,0.3); }
.tag-ch14 { background: var(--ch14-dim); color: var(--ch14); border: 1px solid rgba(6,182,212,0.35); }
/* ── Git area diagram ────────────────────── */
.git-areas {
display: grid;
grid-template-columns: 1fr auto 1fr auto 1fr auto 1fr;
gap: 0;
align-items: center;
margin: 24px 0;
min-width: 0;
}
.git-area {
background: var(--surface2);
border: 2px solid var(--border);
border-radius: 10px;
padding: 16px 10px;
text-align: center;
min-height: 140px;
display: flex;
flex-direction: column;
align-items: center;
gap: 8px;
transition: border-color 0.3s, box-shadow 0.3s;
position: relative;
}
.git-area.active { border-color: var(--ch14); box-shadow: var(--ch14-glow); }
.git-area-title {
font-family: 'JetBrains Mono', monospace;
font-size: 0.7rem;
font-weight: 600;
letter-spacing: 1px;
color: var(--text-dim);
text-transform: uppercase;
}
.git-area-icon { font-size: 1.6rem; margin: 4px 0; }
.git-area-items { display: flex; flex-direction: column; gap: 4px; width: 100%; }
.git-file-node {
font-family: 'JetBrains Mono', monospace;
font-size: 0.7rem;
padding: 4px 8px;
border-radius: 4px;
border: 1px solid;
text-align: center;
animation: fadeIn 0.3s ease;
}
.git-file-node.wdir { background: rgba(255,68,102,0.15); border-color: var(--danger); color: var(--danger); }
.git-file-node.stage { background: rgba(255,170,0,0.15); border-color: var(--accent4); color: var(--accent4); }
.git-file-node.repo { background: rgba(0,255,170,0.15); border-color: var(--accent); color: var(--accent); }
.git-file-node.remote{ background: rgba(6,182,212,0.15); border-color: var(--ch14); color: var(--ch14); }
.git-area-arrow {
display: flex;
flex-direction: column;
align-items: center;
gap: 4px;
padding: 0 4px;
}
.arrow-label {
font-family: 'JetBrains Mono', monospace;
font-size: 0.6rem;
color: var(--text-dim);
white-space: nowrap;
text-align: center;
line-height: 1.3;
}
.arrow-sym { font-size: 1.2rem; color: var(--text-dim); }
.commit-node {
width: 40px; height: 40px;
border-radius: 50%;
background: var(--surface);
border: 2px solid var(--accent);
display: flex; align-items: center; justify-content: center;
font-family: 'JetBrains Mono', monospace;
font-size: 0.62rem;
font-weight: 700;
color: var(--accent);
cursor: default;
transition: all 0.2s;
animation: fadeIn 0.3s ease;
flex-shrink: 0;
}
.commit-node:hover { box-shadow: 0 0 12px rgba(0,255,170,0.4); }
.commit-node.remote-node { border-color: var(--ch14); color: var(--ch14); }
/* ── git status terminal ─────────────────── */
.git-status-box {
background: var(--surface);
border: 1px solid var(--border);
border-radius: 8px;
padding: 14px 16px;
font-family: 'JetBrains Mono', monospace;
font-size: 0.78rem;
line-height: 1.7;
min-height: 80px;
transition: all 0.3s;
}
.git-status-box .s-red { color: var(--danger); }
.git-status-box .s-green { color: var(--accent); }
.git-status-box .s-yellow { color: var(--accent4); }
.git-status-box .s-cyan { color: var(--ch14); }
.git-status-box .s-dim { color: var(--text-dim); }
/* ── command ref ─────────────────────────── */
.cmd-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
gap: 8px;
margin-top: 12px;
}
.cmd-item {
background: var(--surface2);
border: 1px solid var(--border);
border-radius: 6px;
padding: 8px 12px;
display: flex;
gap: 8px;
align-items: flex-start;
}
.cmd-name {
font-family: 'JetBrains Mono', monospace;
font-size: 0.75rem;
color: var(--ch14);
font-weight: 600;
white-space: nowrap;
}
.cmd-desc {
font-size: 0.75rem;
color: var(--text-dim);
line-height: 1.4;
}
/* ── branch graph ────────────────────────── */
.branch-graph-container {
position: relative;
overflow-x: auto;
padding: 20px 0 12px;
}
.branch-graph-svg {
display: block;
margin: 0 auto;
}
.branch-label {
display: inline-flex;
align-items: center;
gap: 6px;
font-family: 'JetBrains Mono', monospace;
font-size: 0.75rem;
padding: 3px 10px;
border-radius: 20px;
font-weight: 600;
}
.branch-label.main { background: rgba(0,255,170,0.15); color: var(--accent); border: 1px solid rgba(0,255,170,0.4); }
.branch-label.feature { background: rgba(107,138,255,0.15); color: var(--accent3); border: 1px solid rgba(107,138,255,0.4); }
.branch-label.head { background: rgba(255,170,0,0.15); color: var(--accent4); border: 1px solid rgba(255,170,0,0.4); }
#branchCanvas {
background: var(--surface2);
border-radius: 8px;
display: block;
margin: 0 auto;
}
/* ── conflict viz ────────────────────────── */
.conflict-file {
background: var(--surface);
border: 1px solid var(--border);
border-radius: 8px;
font-family: 'JetBrains Mono', monospace;
font-size: 0.78rem;
overflow: hidden;
}
.conflict-line {
padding: 4px 16px;
transition: all 0.3s;
line-height: 1.6;
}
.conflict-line.marker { color: var(--accent4); font-weight: 700; }
.conflict-line.ours { background: rgba(0,255,170,0.08); color: var(--accent); }
.conflict-line.sep { color: var(--accent4); font-weight: 700; background: rgba(255,170,0,0.06); }
.conflict-line.theirs { background: rgba(107,138,255,0.08); color: var(--accent3); }
.conflict-line.normal { color: var(--text); }
.conflict-line.resolved { background: rgba(0,255,170,0.12); color: var(--accent); }
.conflict-resolved-banner {
background: rgba(0,255,170,0.15);
border-top: 1px solid rgba(0,255,170,0.3);
padding: 8px 16px;
color: var(--accent);
font-family: 'JetBrains Mono', monospace;
font-size: 0.8rem;
font-weight: 600;
display: none;
}
/* ── cherry-pick canvas ──────────────────── */
#cherryCanvas {
background: var(--surface2);
border-radius: 8px;
display: block;
margin: 0 auto;
}
/* ── stash ───────────────────────────────── */
.stash-area {
display: flex;
gap: 12px;
align-items: flex-start;
flex-wrap: wrap;
margin-top: 12px;
}
.stash-box {
background: var(--surface2);
border: 1px solid var(--border);
border-radius: 8px;
padding: 12px 16px;
flex: 1;
min-width: 160px;
}
.stash-box-title {
font-family: 'JetBrains Mono', monospace;
font-size: 0.7rem;
letter-spacing: 1px;
color: var(--text-dim);
margin-bottom: 8px;
}
.stash-item {
font-family: 'JetBrains Mono', monospace;
font-size: 0.75rem;
padding: 5px 10px;
background: rgba(255,170,0,0.12);
border: 1px solid rgba(255,170,0,0.3);
border-radius: 4px;
color: var(--accent4);
margin-bottom: 4px;
animation: fadeIn 0.3s ease;
}
/* ── workflow tabs ───────────────────────── */
.workflow-tabs {
display: flex;
gap: 8px;
margin-bottom: 20px;
flex-wrap: wrap;
}
.wf-tab {
padding: 8px 20px;
border-radius: 6px;
background: var(--surface2);
border: 1px solid var(--border);
color: var(--text-dim);
font-family: 'JetBrains Mono', monospace;
font-size: 0.8rem;
cursor: pointer;
transition: all 0.2s;
font-weight: 500;
}
.wf-tab.active { background: var(--ch14-dim); border-color: var(--ch14); color: var(--ch14); }
.wf-tab:hover:not(.active) { border-color: var(--text-dim); color: var(--text); }
.wf-panel { display: none; }
.wf-panel.active { display: block; }
.wf-info-grid {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 12px;
margin-top: 16px;
}
.wf-info-card {
background: var(--surface2);
border: 1px solid var(--border);
border-radius: 8px;
padding: 14px 16px;
}
.wf-info-title {
font-family: 'JetBrains Mono', monospace;
font-size: 0.72rem;
font-weight: 700;
letter-spacing: 1px;
margin-bottom: 8px;
text-transform: uppercase;
}
.wf-info-title.pros { color: var(--accent); }
.wf-info-title.cons { color: var(--danger); }
.wf-info-title.when { color: var(--accent4); }
.wf-info-li {
font-size: 0.8rem;
color: var(--text-dim);
line-height: 1.7;
padding-left: 12px;
position: relative;
}
.wf-info-li::before { content: '·'; position: absolute; left: 0; }
/* ── PR flow ─────────────────────────────── */
.pr-flow {
display: flex;
align-items: center;
gap: 0;
flex-wrap: wrap;
margin: 20px 0;
justify-content: center;
}
.pr-step {
display: flex;
flex-direction: column;
align-items: center;
gap: 6px;
padding: 14px 16px;
background: var(--surface2);
border: 1px solid var(--border);
border-radius: 8px;
min-width: 80px;
text-align: center;
transition: all 0.2s;
}
.pr-step:hover { border-color: var(--ch14); }
.pr-step-icon { font-size: 1.4rem; }
.pr-step-label { font-size: 0.72rem; color: var(--text-dim); font-family: 'JetBrains Mono', monospace; }
.pr-arrow { font-size: 1.2rem; color: var(--border); padding: 0 4px; }
/* ── commit conventions ──────────────────── */
.commit-conv-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
gap: 8px;
margin-top: 12px;
}
.conv-item {
background: var(--surface2);
border: 1px solid var(--border);
border-radius: 6px;
padding: 10px 12px;
}
.conv-type {
font-family: 'JetBrains Mono', monospace;
font-size: 0.8rem;
font-weight: 700;
color: var(--ch14);
margin-bottom: 4px;
}
.conv-desc {
font-size: 0.75rem;
color: var(--text-dim);
}
.msg-compare {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 12px;
margin-top: 16px;
}
.msg-good, .msg-bad {
background: var(--surface2);
border-radius: 8px;
padding: 14px 16px;
font-family: 'JetBrains Mono', monospace;
font-size: 0.78rem;
}
.msg-good { border: 1px solid rgba(0,255,170,0.3); }
.msg-bad { border: 1px solid rgba(255,68,102,0.3); }
.msg-label { font-size: 0.68rem; letter-spacing: 1px; font-weight: 700; margin-bottom: 8px; }
.msg-label.good { color: var(--accent); }
.msg-label.bad { color: var(--danger); }
.msg-example { color: var(--text); line-height: 1.7; }
.msg-example .good-line { color: var(--accent); }
.msg-example .bad-line { color: var(--danger); opacity: 0.8; }
/* ── btn row ─────────────────────────────── */
.btn-row { display: flex; gap: 8px; flex-wrap: wrap; margin: 12px 0; }
/* ── animations ──────────────────────────── */
@keyframes fadeIn { from { opacity: 0; transform: scale(0.85); } to { opacity: 1; transform: scale(1); } }
@keyframes slideRight { from { opacity: 0; transform: translateX(-20px); } to { opacity: 1; transform: translateX(0); } }
@keyframes pulse { 0%,100% { opacity: 1; } 50% { opacity: 0.5; } }
/* ── responsive ──────────────────────────── */
@media (max-width: 700px) {
.git-areas { grid-template-columns: 1fr; gap: 8px; }
.git-area-arrow { flex-direction: row; transform: none; }
.arrow-sym { transform: rotate(90deg); }
.wf-info-grid { grid-template-columns: 1fr; }
.msg-compare { grid-template-columns: 1fr; }
}
</style>
</head>
<body class="page-body">
<nav class="page-nav">
<a href="index.html" class="nav-back">← 홈</a>
<div class="nav-chapter-title" style="color:#06b6d4">Ch.14 — Git & 버전관리</div>
<div class="nav-sections">
<a href="#gitbasic" class="nav-sec-link">Git 기초</a>
<a href="#branch" class="nav-sec-link">브랜치</a>
<a href="#conflict" class="nav-sec-link">충돌해결</a>
<a href="#workflow" class="nav-sec-link">협업 전략</a>
</div>
</nav>
<!-- ═══════════════════════════════════════════════════════
SECTION 1: Git 기초 & 영역
═══════════════════════════════════════════════════════ -->
<section id="gitbasic">
<div class="section-header">
<div class="tag tag-ch14">01 — GIT BASICS</div>
<h2>Git 기초 & 영역</h2>
<p>Git은 파일 변경 이력을 관리하는 분산 버전 관리 시스템입니다. Working Directory, Staging Area, Local Repository, Remote Repository 네 영역을 통해 코드 변경사항을 추적·공유합니다.</p>
</div>
<div class="viz-box">
<!-- Area Diagram -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.72rem;color:var(--text-dim);letter-spacing:1px;margin-bottom:8px;">GIT 4대 영역</div>
<div class="git-areas" id="gitAreas">
<!-- Working Directory -->
<div class="git-area" id="areaWdir">
<div class="git-area-title">Working Directory</div>
<div class="git-area-icon">📁</div>
<div class="git-area-items" id="wdirItems">
<div style="font-size:0.68rem;color:var(--text-dim);">파일을 수정하는 공간</div>
</div>
</div>
<div class="git-area-arrow">
<div class="arrow-label" style="color:var(--accent4);">git add</div>
<div class="arrow-sym">→</div>
<div class="arrow-label" style="color:var(--text-dim);font-size:0.55rem;">(스테이징)</div>
</div>
<!-- Staging Area -->
<div class="git-area" id="areaStage">
<div class="git-area-title">Staging Area</div>
<div class="git-area-icon">📋</div>
<div class="git-area-items" id="stageItems">
<div style="font-size:0.68rem;color:var(--text-dim);">커밋 대기 중인 변경</div>
</div>
</div>
<div class="git-area-arrow">
<div class="arrow-label" style="color:var(--accent);">git commit</div>
<div class="arrow-sym">→</div>
</div>
<!-- Local Repo -->
<div class="git-area" id="areaRepo">
<div class="git-area-title">Local Repository</div>
<div class="git-area-icon">🗄️</div>
<div class="git-area-items" id="repoItems" style="flex-direction:row;flex-wrap:wrap;justify-content:center;gap:4px;">
<div style="font-size:0.68rem;color:var(--text-dim);">커밋 히스토리</div>
</div>
</div>
<div class="git-area-arrow">
<div class="arrow-label" style="color:var(--ch14);">git push ↑</div>
<div class="arrow-sym">⇄</div>
<div class="arrow-label" style="color:var(--accent3);">↓ git pull</div>
</div>
<!-- Remote Repo -->
<div class="git-area" id="areaRemote">
<div class="git-area-title">Remote Repository</div>
<div class="git-area-icon">☁️</div>
<div class="git-area-items" id="remoteItems" style="flex-direction:row;flex-wrap:wrap;justify-content:center;gap:4px;">
<div style="font-size:0.68rem;color:var(--text-dim);">GitHub / GitLab 등</div>
</div>
</div>
</div>
<!-- Buttons -->
<div class="btn-row">
<button class="btn" onclick="gitAction('modify')" id="btnModify">📝 파일 수정</button>
<button class="btn" onclick="gitAction('add')" id="btnAdd" disabled>+ git add</button>
<button class="btn" onclick="gitAction('commit')" id="btnCommit" disabled>✓ git commit</button>
<button class="btn" onclick="gitAction('push')" id="btnPush" disabled>↑ git push</button>
<button class="btn" onclick="gitAction('pull')" id="btnPull" style="background:rgba(6,182,212,0.15);color:var(--ch14);border-color:rgba(6,182,212,0.4);">↓ git pull</button>
<button class="btn" onclick="gitAction('reset')" style="background:rgba(255,68,102,0.1);color:var(--danger);border-color:rgba(255,68,102,0.3);">↺ 리셋</button>
</div>
<!-- git status output -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.72rem;color:var(--text-dim);letter-spacing:1px;margin:12px 0 6px;">git status</div>
<div class="git-status-box" id="gitStatusBox">
<span class="s-dim">On branch main</span><br>
<span class="s-dim">nothing to commit, working tree clean</span>
</div>
<!-- Commands Reference -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.72rem;color:var(--text-dim);letter-spacing:1px;margin:20px 0 8px;">주요 명령어 레퍼런스</div>
<div class="cmd-grid">
<div class="cmd-item"><span class="cmd-name">git init</span><span class="cmd-desc">새 저장소 초기화</span></div>
<div class="cmd-item"><span class="cmd-name">git clone</span><span class="cmd-desc">원격 저장소 복제</span></div>
<div class="cmd-item"><span class="cmd-name">git add</span><span class="cmd-desc">변경사항 스테이징</span></div>
<div class="cmd-item"><span class="cmd-name">git commit</span><span class="cmd-desc">스냅샷으로 저장</span></div>
<div class="cmd-item"><span class="cmd-name">git push</span><span class="cmd-desc">원격 저장소로 업로드</span></div>
<div class="cmd-item"><span class="cmd-name">git pull</span><span class="cmd-desc">fetch + merge 결합</span></div>
<div class="cmd-item"><span class="cmd-name">git fetch</span><span class="cmd-desc">변경사항 가져오기만</span></div>
<div class="cmd-item"><span class="cmd-name">git status</span><span class="cmd-desc">현재 상태 확인</span></div>
<div class="cmd-item"><span class="cmd-name">git log</span><span class="cmd-desc">커밋 히스토리 조회</span></div>
<div class="cmd-item"><span class="cmd-name">git diff</span><span class="cmd-desc">변경사항 비교</span></div>
</div>
</div>
</section>
<div class="section-divider"></div>
<!-- ═══════════════════════════════════════════════════════
SECTION 2: 브랜치 & 병합
═══════════════════════════════════════════════════════ -->
<section id="branch">
<div class="section-header">
<div class="tag tag-ch14">02 — BRANCH & MERGE</div>
<h2>브랜치 & 병합</h2>
<p>브랜치는 독립적인 작업 흐름을 만들어 여러 기능을 병렬로 개발할 수 있게 합니다. Merge는 두 브랜치를 합치고, Rebase는 커밋을 재배치하여 히스토리를 선형으로 만듭니다.</p>
</div>
<div class="viz-box">
<!-- Legend -->
<div style="display:flex;gap:12px;flex-wrap:wrap;margin-bottom:16px;align-items:center;">
<span class="branch-label main">● main</span>
<span class="branch-label feature">● feature</span>
<span class="branch-label head">⬡ HEAD</span>
<span style="font-family:'JetBrains Mono',monospace;font-size:0.72rem;color:var(--text-dim);margin-left:4px;">현재 브랜치: <span id="currentBranchLabel" style="color:var(--accent4);">main</span></span>
</div>
<!-- Canvas -->
<div class="branch-graph-container">
<canvas id="branchCanvas" width="720" height="200"></canvas>
</div>
<!-- Buttons -->
<div class="btn-row" style="margin-top:16px;">
<button class="btn" onclick="branchAction('create')">🌿 브랜치 생성</button>
<button class="btn" onclick="branchAction('commit')">+ 커밋 추가</button>
<button class="btn" onclick="branchAction('merge')" id="btnMerge">⚡ Merge</button>
<button class="btn" onclick="branchAction('rebase')" id="btnRebase">↰ Rebase</button>
<button class="btn" onclick="branchAction('switch')">⇄ 브랜치 전환</button>
<button class="btn" onclick="branchAction('reset')" style="background:rgba(255,68,102,0.1);color:var(--danger);border-color:rgba(255,68,102,0.3);">↺ 리셋</button>
</div>
<!-- Info panel -->
<div class="git-status-box" id="branchInfoBox" style="margin-top:8px;">
<span class="s-dim">main: C1 → C2 → C3 | HEAD → main</span><br>
<span class="s-dim">feature 브랜치를 생성해보세요.</span>
</div>
<!-- Merge vs Rebase explanation -->
<div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;margin-top:16px;">
<div style="background:var(--surface2);border:1px solid rgba(0,255,170,0.25);border-radius:8px;padding:14px 16px;">
<div style="font-family:'JetBrains Mono',monospace;font-size:0.72rem;font-weight:700;color:var(--accent);margin-bottom:8px;">MERGE</div>
<div style="font-size:0.8rem;color:var(--text-dim);line-height:1.7;">
두 브랜치를 합쳐 <strong style="color:var(--text);">머지 커밋</strong>을 생성합니다.<br>
히스토리가 다이아몬드 형태로 남아 <strong style="color:var(--text);">비선형</strong>이 됩니다.<br>
<span style="color:var(--accent);">장점:</span> 실제 병합 이력이 보존됩니다.
</div>
</div>
<div style="background:var(--surface2);border:1px solid rgba(107,138,255,0.25);border-radius:8px;padding:14px 16px;">
<div style="font-family:'JetBrains Mono',monospace;font-size:0.72rem;font-weight:700;color:var(--accent3);margin-bottom:8px;">REBASE</div>
<div style="font-size:0.8rem;color:var(--text-dim);line-height:1.7;">
커밋을 base 브랜치 위에 <strong style="color:var(--text);">재배치</strong>합니다.<br>
히스토리가 <strong style="color:var(--text);">선형</strong>으로 정렬됩니다.<br>
<span style="color:var(--accent3);">주의:</span> 공유 브랜치에선 사용 금지.
</div>
</div>
</div>
</div>
</section>
<div class="section-divider"></div>
<!-- ═══════════════════════════════════════════════════════
SECTION 3: 충돌 해결 & Cherry-pick
═══════════════════════════════════════════════════════ -->
<section id="conflict">
<div class="section-header">
<div class="tag tag-ch14">03 — CONFLICT & CHERRY-PICK</div>
<h2>충돌 해결 & Cherry-pick</h2>
<p>같은 파일의 같은 부분을 두 브랜치가 다르게 수정하면 충돌(conflict)이 발생합니다. Cherry-pick은 특정 커밋만 선택적으로 다른 브랜치에 적용하는 기법입니다.</p>
</div>
<div class="viz-box">
<!-- Conflict subsection -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.75rem;font-weight:700;color:var(--accent4);margin-bottom:12px;letter-spacing:0.5px;">MERGE CONFLICT</div>
<div style="display:grid;grid-template-columns:1fr 1fr;gap:16px;margin-bottom:16px;">
<div>
<div style="font-family:'JetBrains Mono',monospace;font-size:0.68rem;color:var(--text-dim);margin-bottom:6px;">충돌 파일 내용</div>
<div class="conflict-file" id="conflictFile">
<div class="conflict-line normal">// app.js</div>
<div class="conflict-line normal">function greet(name) {</div>
<div class="conflict-line marker" id="cl-marker1"><<<<<<< HEAD</div>
<div class="conflict-line ours" id="cl-ours"> return `안녕하세요, ${name}!`;</div>
<div class="conflict-line sep" id="cl-sep">=======</div>
<div class="conflict-line theirs" id="cl-theirs"> return `Hello, ${name}!`;</div>
<div class="conflict-line marker" id="cl-marker2">>>>>>>> feature/i18n</div>
<div class="conflict-line normal">}</div>
<div class="conflict-resolved-banner" id="conflictBanner">✓ 충돌 해결됨 — merge commit 생성</div>
</div>
</div>
<div>
<div style="font-family:'JetBrains Mono',monospace;font-size:0.68rem;color:var(--text-dim);margin-bottom:6px;">충돌 상태 설명</div>
<div class="git-status-box" id="conflictStatus" style="min-height:150px;">
<span class="s-red">CONFLICT (content): Merge conflict in app.js</span><br><br>
<span class="s-dim"><<<<<<< HEAD</span> — 현재 브랜치 내용<br>
<span class="s-dim">=======</span> — 구분선<br>
<span class="s-dim">>>>>>>> feature</span> — 병합 브랜치 내용<br><br>
<span class="s-yellow">원하는 내용을 선택하고 마커를 제거하세요.</span>
</div>
</div>
</div>
<div class="btn-row">
<button class="btn" onclick="resolveConflict('ours')" id="btnOurs">✓ HEAD 내용 선택 (한국어)</button>
<button class="btn" onclick="resolveConflict('theirs')" id="btnTheirs">✓ feature 내용 선택 (영어)</button>
<button class="btn" onclick="resolveConflict('both')" id="btnBoth" style="background:rgba(107,138,255,0.15);color:var(--accent3);border-color:rgba(107,138,255,0.4);">⊕ 두 내용 모두 유지</button>
<button class="btn" onclick="resolveConflict('reset')" style="background:rgba(255,68,102,0.1);color:var(--danger);border-color:rgba(255,68,102,0.3);">↺ 리셋</button>
</div>
<div style="height:1px;background:var(--border);margin:24px 0;"></div>
<!-- Cherry-pick subsection -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.75rem;font-weight:700;color:var(--accent3);margin-bottom:12px;letter-spacing:0.5px;">CHERRY-PICK</div>
<div style="font-size:0.82rem;color:var(--text-dim);margin-bottom:14px;line-height:1.7;">
feature 브랜치의 특정 커밋(C4)만 main 브랜치에 적용합니다. 커밋이 복사되어 새 해시(C4')로 적용됩니다.
</div>
<canvas id="cherryCanvas" width="680" height="160"></canvas>
<div class="btn-row" style="margin-top:12px;">
<button class="btn" onclick="cherryPickAction()">🍒 Cherry-pick C4</button>
<button class="btn" onclick="cherryPickReset()" style="background:rgba(255,68,102,0.1);color:var(--danger);border-color:rgba(255,68,102,0.3);">↺ 리셋</button>
</div>
<div class="git-status-box" id="cherryStatus" style="margin-top:10px;">
<span class="s-dim">$ git cherry-pick <commit-hash></span><br>
<span class="s-dim">feature 브랜치의 C4 커밋을 선택할 수 있습니다.</span>
</div>
<div style="height:1px;background:var(--border);margin:24px 0;"></div>
<!-- Stash subsection -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.75rem;font-weight:700;color:var(--ch14);margin-bottom:12px;letter-spacing:0.5px;">GIT STASH</div>
<div style="font-size:0.82rem;color:var(--text-dim);margin-bottom:14px;line-height:1.7;">
작업 중인 변경사항을 임시로 저장(stash)하고 나중에 복원할 수 있습니다. 급히 다른 브랜치로 전환할 때 유용합니다.
</div>
<div class="stash-area">
<div class="stash-box" style="border-color:rgba(255,68,102,0.3);">
<div class="stash-box-title">WORKING DIRECTORY</div>
<div id="stashWdir">
<div class="git-file-node wdir">feature.js (수정됨)</div>
<div class="git-file-node wdir">utils.js (수정됨)</div>
</div>
</div>
<div style="display:flex;flex-direction:column;gap:8px;justify-content:center;">
<button class="btn" onclick="stashAction('stash')" id="btnStash" style="font-size:0.75rem;padding:8px 14px;">작업 중단 →<br>git stash</button>
<button class="btn" onclick="stashAction('pop')" id="btnPop" style="font-size:0.75rem;padding:8px 14px;" disabled>← 작업 재개<br>git stash pop</button>
</div>
<div class="stash-box" style="border-color:rgba(255,170,0,0.3);">
<div class="stash-box-title">STASH</div>
<div id="stashList"><div style="font-size:0.72rem;color:var(--text-dim);">(비어있음)</div></div>
</div>
</div>
<div class="git-status-box" id="stashStatus" style="margin-top:12px;">
<span class="s-dim">현재 변경사항이 있습니다. "작업 중단"으로 stash에 저장하세요.</span>
</div>
</div>
</section>
<div class="section-divider"></div>
<!-- ═══════════════════════════════════════════════════════
SECTION 4: Git 협업 전략
═══════════════════════════════════════════════════════ -->
<section id="workflow">
<div class="section-header">
<div class="tag tag-ch14">04 — WORKFLOW & COLLABORATION</div>
<h2>Git 협업 전략</h2>
<p>팀의 규모와 배포 전략에 따라 적합한 Git 워크플로우를 선택합니다. GitHub Flow는 단순하고 빠르며, Git Flow는 체계적이고, Trunk Based는 지속적 배포에 최적화됩니다.</p>
</div>
<div class="viz-box">
<!-- Workflow Tabs -->
<div class="workflow-tabs">
<button class="wf-tab active" onclick="switchWorkflow('github')">GitHub Flow</button>
<button class="wf-tab" onclick="switchWorkflow('gitflow')">Git Flow</button>
<button class="wf-tab" onclick="switchWorkflow('trunk')">Trunk Based</button>
</div>
<!-- GitHub Flow Panel -->
<div class="wf-panel active" id="wf-github">
<canvas id="githubFlowCanvas" width="680" height="130"></canvas>
<div class="wf-info-grid">
<div class="wf-info-card">
<div class="wf-info-title when">사용 시기</div>
<div class="wf-info-li">소규모~중간 팀</div>
<div class="wf-info-li">지속적 배포(CI/CD) 환경</div>
<div class="wf-info-li">단일 프로덕션 버전 유지</div>
<div class="wf-info-li">SaaS, 웹 서비스</div>
</div>
<div style="display:grid;grid-template-rows:1fr 1fr;gap:8px;">
<div class="wf-info-card">
<div class="wf-info-title pros">장점</div>
<div class="wf-info-li">매우 단순한 규칙</div>
<div class="wf-info-li">빠른 배포 사이클</div>
<div class="wf-info-li">PR 기반 코드 리뷰</div>
</div>
<div class="wf-info-card">
<div class="wf-info-title cons">단점</div>
<div class="wf-info-li">여러 프로덕션 버전 관리 어려움</div>
<div class="wf-info-li">릴리즈 스케줄링이 없음</div>
</div>
</div>
</div>
</div>
<!-- Git Flow Panel -->
<div class="wf-panel" id="wf-gitflow">
<canvas id="gitFlowCanvas" width="680" height="200"></canvas>
<div class="wf-info-grid">
<div class="wf-info-card">
<div class="wf-info-title when">사용 시기</div>
<div class="wf-info-li">버전이 명확한 소프트웨어</div>
<div class="wf-info-li">정기 릴리즈 일정이 있는 프로젝트</div>
<div class="wf-info-li">대형 팀 / 엔터프라이즈</div>
<div class="wf-info-li">모바일 앱, 패키지 라이브러리</div>
</div>
<div style="display:grid;grid-template-rows:1fr 1fr;gap:8px;">
<div class="wf-info-card">
<div class="wf-info-title pros">장점</div>
<div class="wf-info-li">체계적인 릴리즈 관리</div>
<div class="wf-info-li">hotfix, release 분리</div>
<div class="wf-info-li">명확한 브랜치 역할</div>
</div>
<div class="wf-info-card">
<div class="wf-info-title cons">단점</div>
<div class="wf-info-li">복잡한 브랜치 구조</div>
<div class="wf-info-li">CI/CD에 부적합</div>
<div class="wf-info-li">배포 사이클이 느림</div>
</div>
</div>
</div>
</div>
<!-- Trunk Based Panel -->
<div class="wf-panel" id="wf-trunk">
<canvas id="trunkCanvas" width="680" height="120"></canvas>
<div class="wf-info-grid">
<div class="wf-info-card">
<div class="wf-info-title when">사용 시기</div>
<div class="wf-info-li">고성능 엔지니어링 팀</div>
<div class="wf-info-li">하루 여러 번 배포하는 환경</div>
<div class="wf-info-li">Feature Flag 사용 가능 시</div>
<div class="wf-info-li">Google, Meta 등 빅테크</div>
</div>
<div style="display:grid;grid-template-rows:1fr 1fr;gap:8px;">
<div class="wf-info-card">
<div class="wf-info-title pros">장점</div>
<div class="wf-info-li">최소한의 브랜치 복잡도</div>
<div class="wf-info-li">머지 충돌 최소화</div>
<div class="wf-info-li">빠른 피드백 루프</div>
</div>
<div class="wf-info-card">
<div class="wf-info-title cons">단점</div>
<div class="wf-info-li">강한 CI/CD 인프라 필요</div>
<div class="wf-info-li">Feature Flag 관리 필요</div>
<div class="wf-info-li">미완성 코드 노출 위험</div>
</div>
</div>
</div>
</div>
<div style="height:1px;background:var(--border);margin:28px 0;"></div>
<!-- PR Flow -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.75rem;font-weight:700;color:var(--ch14);margin-bottom:16px;letter-spacing:0.5px;">PULL REQUEST / CODE REVIEW 흐름</div>
<div class="pr-flow">
<div class="pr-step">
<div class="pr-step-icon">🍴</div>
<div class="pr-step-label">Fork</div>
</div>
<div class="pr-arrow">→</div>
<div class="pr-step">
<div class="pr-step-icon">🌿</div>
<div class="pr-step-label">feature<br>branch</div>
</div>
<div class="pr-arrow">→</div>
<div class="pr-step">
<div class="pr-step-icon">✏️</div>
<div class="pr-step-label">코드 작성<br>& 커밋</div>
</div>
<div class="pr-arrow">→</div>
<div class="pr-step" style="border-color:rgba(6,182,212,0.4);">
<div class="pr-step-icon">📬</div>
<div class="pr-step-label" style="color:var(--ch14);">PR 생성</div>
</div>
<div class="pr-arrow">→</div>
<div class="pr-step">
<div class="pr-step-icon">👀</div>
<div class="pr-step-label">Code<br>Review</div>
</div>
<div class="pr-arrow">→</div>
<div class="pr-step">
<div class="pr-step-icon">✅</div>
<div class="pr-step-label">승인<br>Approve</div>
</div>
<div class="pr-arrow">→</div>
<div class="pr-step" style="border-color:rgba(0,255,170,0.4);">
<div class="pr-step-icon">🔀</div>
<div class="pr-step-label" style="color:var(--accent);">Merge</div>
</div>
</div>
<div style="height:1px;background:var(--border);margin:28px 0;"></div>
<!-- Commit Message Convention -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.75rem;font-weight:700;color:var(--accent4);margin-bottom:12px;letter-spacing:0.5px;">커밋 메시지 컨벤션</div>
<div class="commit-conv-grid">
<div class="conv-item">
<div class="conv-type">feat:</div>
<div class="conv-desc">새로운 기능 추가</div>
</div>
<div class="conv-item">
<div class="conv-type">fix:</div>
<div class="conv-desc">버그 수정</div>
</div>
<div class="conv-item">
<div class="conv-type">docs:</div>
<div class="conv-desc">문서 변경</div>
</div>
<div class="conv-item">
<div class="conv-type">style:</div>
<div class="conv-desc">코드 포맷팅 (로직 변경 없음)</div>
</div>
<div class="conv-item">
<div class="conv-type">refactor:</div>
<div class="conv-desc">코드 리팩터링</div>
</div>
<div class="conv-item">
<div class="conv-type">test:</div>
<div class="conv-desc">테스트 코드 추가/수정</div>
</div>
<div class="conv-item">
<div class="conv-type">chore:</div>
<div class="conv-desc">빌드/설정 등 기타 변경</div>
</div>
<div class="conv-item">
<div class="conv-type">perf:</div>
<div class="conv-desc">성능 개선</div>
</div>
</div>
<!-- Good vs Bad messages -->
<div style="font-family:'JetBrains Mono',monospace;font-size:0.7rem;color:var(--text-dim);margin:20px 0 8px;letter-spacing:1px;">좋은 vs 나쁜 커밋 메시지</div>
<div class="msg-compare">
<div class="msg-good">
<div class="msg-label good">GOOD</div>
<div class="msg-example">
<span class="good-line">feat: 사용자 로그인 기능 구현</span><br>
<span class="good-line">fix: 결제 금액 소수점 오류 수정</span><br>
<span class="good-line">refactor: API 응답 처리 함수 분리</span><br>
<span class="good-line">docs: README 설치 가이드 업데이트</span>
</div>
</div>
<div class="msg-bad">
<div class="msg-label bad">BAD</div>
<div class="msg-example">
<span class="bad-line">수정함</span><br>
<span class="bad-line">WIP</span><br>
<span class="bad-line">fix bug</span><br>
<span class="bad-line">asdfgh</span>
</div>
</div>
</div>
<div class="info-text" style="margin-top:16px;">
좋은 커밋 메시지는 <strong>무엇을(what)</strong>이 아닌 <strong>왜(why)</strong>를 설명합니다.
컨벤션을 따르면 자동 changelog 생성, 빠른 코드 리뷰, 이슈 트래킹이 용이해집니다.
</div>
</div>
</section>
<footer>CS Visualizer · <a href="index.html" style="color:#06b6d4;text-decoration:none;">목차로 돌아가기</a></footer>
<script>
// ═══════════════════════════════════════════════════════
// SECTION 1: GIT AREAS
// ═══════════════════════════════════════════════════════
let gitState = {
wdir: [],
stage: [],
repo: [],
remote: [],
fileCount: 0
};
function gitAction(action) {
const statusBox = document.getElementById('gitStatusBox');
if (action === 'reset') {
gitState = { wdir: [], stage: [], repo: [], remote: [], fileCount: 0 };
renderGitAreas();
['btnAdd','btnCommit','btnPush'].forEach(id => document.getElementById(id).disabled = true);
document.getElementById('btnModify').disabled = false;
statusBox.innerHTML = '<span class="s-dim">On branch main</span><br><span class="s-dim">nothing to commit, working tree clean</span>';
['areaWdir','areaStage','areaRepo','areaRemote'].forEach(id => document.getElementById(id).classList.remove('active'));
return;
}
if (action === 'modify') {
gitState.fileCount++;
const fname = `file${gitState.fileCount}.js`;
gitState.wdir.push(fname);
document.getElementById('btnAdd').disabled = false;
document.getElementById('areaWdir').classList.add('active');
document.getElementById('areaStage').classList.remove('active');
statusBox.innerHTML =
`<span class="s-red">On branch main</span><br>` +
`<span class="s-red">Changes not staged for commit:</span><br>` +
`<span class="s-red"> modified: ${fname}</span><br><br>` +
`<span class="s-dim">use "git add <file>" to stage</span>`;
renderGitAreas();
return;
}
if (action === 'add') {
if (gitState.wdir.length === 0) return;
const moved = gitState.wdir.splice(0);
gitState.stage.push(...moved);
document.getElementById('btnCommit').disabled = false;
if (gitState.wdir.length === 0) document.getElementById('btnAdd').disabled = true;
document.getElementById('areaStage').classList.add('active');
document.getElementById('areaWdir').classList.remove('active');
statusBox.innerHTML =
`<span class="s-yellow">On branch main</span><br>` +
`<span class="s-yellow">Changes to be committed:</span><br>` +
moved.map(f => `<span class="s-yellow"> modified: ${f}</span>`).join('<br>') +
`<br><br><span class="s-dim">use "git commit" to save</span>`;
renderGitAreas();
return;
}
if (action === 'commit') {
if (gitState.stage.length === 0) return;
const files = gitState.stage.splice(0);
const hash = Math.random().toString(36).slice(2, 9);
gitState.repo.push({ hash: hash.slice(0,7), files });
document.getElementById('btnPush').disabled = false;
document.getElementById('btnCommit').disabled = true;
document.getElementById('areaRepo').classList.add('active');
document.getElementById('areaStage').classList.remove('active');
statusBox.innerHTML =
`<span class="s-green">On branch main</span><br>` +
`<span class="s-green">[main ${hash.slice(0,7)}] feat: ${files.join(', ')} 추가</span><br>` +
`<span class="s-green"> ${files.length} file(s) changed</span><br><br>` +
`<span class="s-dim">nothing to commit, working tree clean</span>`;
renderGitAreas();
return;
}
if (action === 'push') {
if (gitState.repo.length === 0) return;
const lastCommit = gitState.repo[gitState.repo.length - 1];
const alreadyPushed = gitState.remote.find(c => c.hash === lastCommit.hash);
if (!alreadyPushed) gitState.remote.push({...lastCommit});
document.getElementById('areaRemote').classList.add('active');
document.getElementById('areaRepo').classList.remove('active');
statusBox.innerHTML =
`<span class="s-cyan">Enumerating objects: ${lastCommit.files.length + 2}, done.</span><br>` +
`<span class="s-cyan">Writing objects: 100% — done</span><br>` +
`<span class="s-cyan">To https://github.com/user/repo.git</span><br>` +
`<span class="s-cyan"> main → main</span>`;
renderGitAreas();
return;
}
if (action === 'pull') {
statusBox.innerHTML =
`<span class="s-cyan">remote: Enumerating objects done.</span><br>` +
`<span class="s-cyan">Updating abc123..def456</span><br>` +
`<span class="s-green">Fast-forward</span><br>` +
`<span class="s-dim">Already up to date.</span>`;
document.getElementById('areaRemote').classList.add('active');
setTimeout(() => document.getElementById('areaRemote').classList.remove('active'), 1000);
}
}
function renderGitAreas() {
// Working Dir
const wdEl = document.getElementById('wdirItems');
if (gitState.wdir.length === 0) {
wdEl.innerHTML = '<div style="font-size:0.68rem;color:var(--text-dim);">파일을 수정하는 공간</div>';