From the course: Robot Framework Test Automation: Jenkins CI and Git Version Control
Join today to access over 22,600 courses taught by industry experts.
Branching and merging overview
From the course: Robot Framework Test Automation: Jenkins CI and Git Version Control
Branching and merging overview
[Instructor] As we discussed in the overview video, one of the most powerful features of using version control is the notion of creating branches that will hold changes for new features and potentially experiments, and then being able to merge those changes back into either an integration branch or a release branch, and then ultimately into the master branch. So I'd like to walk through this image real quickly again before we go in and talk about branching. So far we've only been dealing with that top green line, the master branch. The master branch is considered to be the current production state of our software. So you can see we generally started with version zero or version 0.1, which had very little feature content. At some point what we did is we created this development branch, which is a long-running branch that will be used as an integration point as various feature teams develop new features and want to merge them together to see if they can peacefully coexist before…
Download courses and learn on the go
Watch courses on your mobile device without an internet connection. Download courses using your iOS or Android LinkedIn Learning app.