From the course: Programming Foundations: Version Control with Git (2020)

Unlock the full course today

Join today to access over 22,600 courses taught by industry experts or purchase this course individually.

Merging branches

Merging branches

From the course: Programming Foundations: Version Control with Git (2020)

Start my 1-month free trial

Merging branches

“

- [Instructor] When the branching workflow is being used, the master branch is usually designated as the central repo, where the latest and most stable code base is stored. Feature branches are created for in-progress work. Once the work is completed in the feature branch, it's then merged back into the master branch to keep it up to date. To merge a branch, in this example our theme update branch, start by making sure you've checked out the branch you want to merge into the master branch. If you don't see the black circular outline next to the master branch, then double click on it to check it out. Then we'll initiate the merge by clicking the merge button at the top of the app. A pop-up will appear. Highlight the latest commit from the theme update branch. This is to indicate which commit to merge into the master repo. Then under options select the first three. This first option, commit merge immediately if no conflicts,…

Contents