From the course: Robot Framework Test Automation: Jenkins CI and Git Version Control

Unlock this course with a free trial

Join today to access over 22,400 courses taught by industry experts.

Branch and merge basics

Branch and merge basics

- [Instructor] The PyCharm mechanics of creating, updating, and merging branches is fairly easy to demonstrate, so I'll do that now in this video and then the next series of videos I'll walk through some iterations of branching to simulate a real-world development lifecycle. The place in PyCharm where we deal with branches is right down here at the bottom right of the UI. You'll notice if I click here, a dropdown pops up and the only branches we see are the remote branch of origin/master. There are two different ways to create a new branch. We can either do it here in our local instance of Git by clicking New Branch, or we can go to the website repository itself and we can click here in this branches dropdown, and notice the only branch here is master. It's a little bit counter-intuitive because there is no New Branch button here, but if you simply start typing in Feature 1, for instance, you'll notice we get a button here that says Create branch: Feature 1. So I'll do that and now…

Contents