Autoplay
Autocomplete
Previous Lesson
Complete and Continue
7-1-2-GitEpisode2(第2篇)-Branch、Merge
關於本課程
FAQ-Handout,SampleCode(常見問題-講義、範例程式碼)
(P0)Git(1to8)(版控神器)(眉角學程) (4:20)
(P4)Git課程使用說明書 (29:23)
(P5-1)整個學程簡介 (51:22)
(P5-2)GitEpisode1(第1篇)-Stage、Commit (7:28)
(P5-3)GitEpisode2(第2篇)-Branch、Merge (7:05)
(P5-4)GitEpisode3(第3篇)-LocalBranch、RemoteTrackingBranch、RemoteBranch、AnnotatedTag、LightweightTag (19:20)
(P5-5)GitEpisode4(第4篇)-Diff、Patch、GitIgnore、Stash、WorkTree、GitBlame、GitShow、GitBundle (14:53)
(P5-6)GitEpisode5(第5篇)-Rebase、Revert、InsertCommit、UpdateCommit、DeleteCommit (16:37)
(P5-7)GitEpisode6(第6篇)-BackUp GitConfig、GitHook、Jest、PreCommit、Husky、Eslint、EslintConfig、LintStaged (18:15)
(P5-8)GitEpisode7(第7篇)-GitObject、Blob、Tree、Commit、Tag、Compress、ShrinkRepository (23:28)
(P5-9)GitEpisode8(第8篇)-GitHub、(Centralized、FeatureBranch、Forking、GitFlow)Workflow (17:02)
(P5-10)Git(版控神器)CrashCourse(速成班) (12:32)
Branch(分支)
(T7-1)Tutorial簡介 (6:40)
(T7-2)GitBash的前置準備 (8:22)
(T7-3)SourceTree的前置準備 (3:08)
(T7-4)關於SourceTree的Branch的Create、Delete、Checkout、Rename (12:50)
(T7-5)關於GitBash的Branch的Create、Delete、Checkout、Rename (26:35)
(T7-6)關於TortoiseGit的Branch的Create、Delete、Checkout、Rename (17:19)
(T7-7)複習GitCommand (2:58)
(T7-8)我的個人建議 (4:50)
FastForwardMerge(快進合併)
(T8-1)Tutorial簡介 (7:03)
(T8-2)關於FastForwardMerge(快進合併)、NoFastForwardMerge(非快進合併)、NoFastForwardNoCommitMerge(非快進非提交合併) (12:42)
(T8-3)SourceTree的前置準備 (35:50)
(T8-4)GitBash的前置準備 (38:50)
(T8-5)TortoiseGit的前置準備 (35:22)
(T8-6)SourceTree的FastForwardMerge(快進合併) (16:08)
(T8-7)SourceTree的NoFastForwardMerge(非快進合併) (14:08)
(T8-8)GitBash的FastForwardMerge(快進合併) (8:22)
(T8-9)GitBash的NoFastForwardMerge(非快進合併) (9:47)
(T8-10)GitBash的NoFastForwardNoCommitMerge(非快進非提交合併) (13:19)
(T8-11)TortoiseGit的FastForwardMerge(快進合併) (7:31)
(T8-12)TortoiseGit的NoFastForwardMerge(非快進合併) (7:50)
(T8-13)TortoiseGit的NoFastForwardNoCommitMerge(非快進非提交合併) (9:43)
(T8-14)複習GitCommand (12:00)
(T8-15)我的個人建議 (14:17)
3WayMerge(三路合併)
(T9-1)Tutorial簡介 (4:54)
(T9-2)關於3WayMerge、MergeConflict、UndoMergeAfterCommit、UndoMergeBeforeCommit (13:05)
(T9-3)SourceTree的前置準備 (18:44)
(T9-4)SourceTree的前置準備，關於3WayMerge (11:34)
(T9-5)SourceTree的前置準備，關於3WayMerge和MergeConflict (12:50)
(T9-6)GitBash的前置準備 (13:03)
(T9-7)GitBash的前置準備，關於3WayMerge (20:02)
(T9-8)GitBash的前置準備，關於3WayMerge和MergeConflict (22:08)
(T9-9)TortoiseGit的前置準備 (14:41)
(T9-10)TortoiseGit的前置準備,關於3WayMerge (27:57)
(T9-11)TortoiseGit的前置準備,關於3WayMerge和MergeConflict (21:34)
(T9-12)SourceTree的3WayMerge (31:26)
(T9-13)SourceTree的3WayMerge之後，UndoMergeAfterCommit (9:02)
(T9-14)SourceTree的3WayMerge，但產生MergeConflict之後。UndoMergeBeforeCommit (13:25)
(T9-15)SourceTree的3WayMerge，使用P4Merge解決MergeConflict (22:33)
(T9-16)GitBash的3WayMerge (18:31)
(T9-17)GitBash的3WayMerge之後，UndoMergeAfterCommit (11:29)
(T9-18)GitBash的3WayMerge，但產生MergeConflict之後。UndoMergeBeforeCommit (6:43)
(T9-19)GitBash的3WayMerge，使用P4Merge解決MergeConflict (9:07)
(T9-20)TortoiseGit的3WayMerge (6:37)
(T9-21)TortoiseGit的3WayMerge之後，UndoMergeAfterCommit (8:11)
(T9-22)TortoiseGit的3WayMerge，但產生MergeConflict之後。UndoMergeBeforeCommit (8:20)
(T9-23)TortoiseGit的3WayMerge，使用P4Merge解決MergeConflict (8:43)
(T9-24)複習GitCommand (13:26)
(T9-25)我的個人建議 (25:46)
SquashMerge(壓縮合併)
(T10-1)Tutorial簡介 (6:06)
(T10-2)關於SquashMerge(壓縮合併) (5:06)
(T10-3)GitBash的前置準備 (29:48)
(T10-4)TortoiseGit的前置準備 (23:27)
(T10-5)GitBash的SquashMerge(壓縮合併) (10:31)
(T10-6)GitBash的3WayMerge(三路合併)之後執行SquashMerge(壓縮合併) (17:34)
(T10-7)TortoiseGit的SquashMerge(壓縮合併) (7:30)
(T10-8)TortoiseGit的3WayMerge(三路合併)之後執行SquashMerge(壓縮合併) (9:41)
(T10-9)複習GitCommand (4:13)
(T10-10)我的個人建議 (10:00)
CherryPick(挑櫻桃)
(T11-1)Tutorial簡介 (4:57)
(T11-2)CherryPick(挑櫻桃)和CherryPickNCommit(挑N個櫻桃) (14:35)
(T11-3)SourceTree的前置準備 (19:55)
(T11-4)GitBash的前置準備 (24:42)
(T11-5)TortoiseGit的前置準備 (21:14)
(T11-6)SourceTree的CherryPick(挑櫻桃) (12:52)
(T11-7)GitBash的CherryPick(挑櫻桃) (13:38)
(T11-8)GitBash的CherryPickNCommit(採N個櫻桃) (14:26)
(T11-9)TortoiseGit的CherryPick(挑櫻桃) (12:58)
(T11-10)TortoiseGit的CherryPickNCommit(採N個櫻桃) (11:45)
(T11-11)複習GitCommand (6:12)
(T11-12)我的個人建議 (2:32)
刪除已經合併的Branch(分支)
(T12-1)Tutorial簡介 (8:24)
(T12-2)GitBash的前置準備 (27:59)
(T12-3)刪除已經合併的Branch (23:38)
(T12-4)複習GitCommand (14:06)
(T12-5)我的個人建議 (6:33)
課程評價
課程評價
(T9-17)GitBash的3WayMerge之後，UndoMergeAfterCommit
Lesson content locked
If you're already enrolled,
you'll need to login
.
Enroll in Course to Unlock