From the course: Git for Teams
Unlock the full course today
Join today to access over 22,600 courses taught by industry experts or purchase this course individually.
Trunk-based development
- [Instructor] In this lesson, we'll discuss the trunk-based development workflow. Trunk-based development is a rather new workflow. Teams practicing trunk-based development only collaborate on a single branch named trunk. Under this strategy, trunk is the only long-lived branch used by the team for pulling, syncing, or merging. Some teams practicing trunk-based development will allow branching from trunk for release branches or other short-lived branches used for code reviews. In general, branching from trunk, such as when using a feature branch, is not acceptable. With few exceptions, developers commit directly to trunk. You might wonder why a team would give up the flexibility of working in multiple branches. The selling point behind Trunk-Based Development or TBD is that it reduces the problems that frequently occur when merging long-lived branches such as breaking the build, duplicate work, and incompatible changes. By focusing all development work on the lone trunk branch, the…
Practice while you learn with exercise files
Download the files the instructor uses to teach the course. Follow along and learn by watching, listening and practicing.
Contents
-
-
-
-
(Locked)
Teaming with remote platforms overview1m 39s
-
(Locked)
Remote platform selection4m 19s
-
(Locked)
GitLab installation4m 16s
-
GitLab overview4m 36s
-
(Locked)
User account setup4m 44s
-
(Locked)
Account administration and preferences3m 17s
-
(Locked)
Keeping secrets3m 30s
-
(Locked)
Git workflows1m 11s
-
(Locked)
Trunk-based development3m 13s
-
(Locked)
Git flow3m 35s
-
(Locked)
Protecting branches4m 42s
-
(Locked)
Issues6m 59s
-
(Locked)
Feature branches6m 4s
-
(Locked)
Code reviews4m 4s
-
(Locked)
Merging feature branches4m 18s
-
(Locked)
Git Flow wrap-up1m 51s
-
(Locked)
-
-
-