New Feature: Playlist Center! Pick a topic and let our playlists guide the way—like a learning mixtape.

Start learning with our library of video tutorials taught by experts. Get started

Fundamentals of Software Version Control
Illustration by

Branching and merging


From:

Fundamentals of Software Version Control

with Michael Lehman

Video: Branching and merging

The last major piece of functionality we need to explore is branching and merging. In Git, branching and merging is very easy and very lightweight. So first, let's run Git branch. We can see we are on the master branch. This is sometimes called the trunk. To create a branch is as easy as saying git branch b1, and now we have a new branch, you can see we have branches b1 and master. And you can see between the asterisk and the text in green, they we're on the master branch.
Expand all | Collapse all
  1. 2m 12s
    1. Welcome
      56s
    2. What you should know before taking this course
      23s
    3. Using the exercise files
      53s
  2. 25m 8s
    1. Overview of software version control
      2m 51s
    2. Understanding version control concepts
      5m 14s
    3. Demo one: Getting started
      11m 1s
    4. Demo two: Handling the "oops"
      6m 2s
  3. 11m 3s
    1. The history of version control
      3m 44s
    2. Terminology
      4m 27s
    3. Exploring centralized vs. distributed systems
      2m 52s
  4. 28m 42s
    1. Getting files in and out of a repository
      4m 38s
    2. Saving changes and tracking history
      2m 47s
    3. Reverting to a prior version
      1m 42s
    4. Creating tags and labels
      1m 5s
    5. Branching and merging
      4m 10s
    6. Exploring workflow integration and continuous builds
      2m 46s
    7. Using graphical user interface (GUI) tools
      2m 39s
    8. Integrating a version control system with an integrated development environment (IDE)
      2m 50s
    9. Examining shell integration
      3m 26s
    10. Looking at forward and reverse integration
      2m 39s
  5. 25m 59s
    1. Installation and setup
      3m 31s
    2. Creating a repository and a project
      5m 10s
    3. Working with check-in, checkout, and revert
      6m 12s
    4. Tagging
      1m 34s
    5. Branching and merging
      5m 32s
    6. Working with GUI clients and IDE integration
      4m 0s
  6. 16m 13s
    1. Installation and setup
      55s
    2. Working with check-in, checkout, and revert
      9m 34s
    3. Tagging
      1m 7s
    4. Branching and merging
      4m 37s
  7. 26m 41s
    1. Installation and setup
      3m 47s
    2. Creating a repository and a project
      6m 15s
    3. Working with check-in, checkout, and revert
      8m 31s
    4. Tracking history and tagging
      2m 15s
    5. Branching and merging
      5m 53s
  8. 19m 25s
    1. Installation and setup
      3m 1s
    2. Creating a repository and a project
      1m 6s
    3. Working with check-in, checkout, and revert
      6m 39s
    4. Tagging
      2m 13s
    5. Branching and merging
      3m 44s
    6. Working with GUI clients and IDE integration
      2m 42s
  9. 16m 54s
    1. Installation and setup
      1m 48s
    2. Creating a repository and a project
      59s
    3. Working with check-in, checkout, revert, and tracking history
      6m 9s
    4. Tagging
      1m 50s
    5. Branching and merging
      4m 29s
    6. Exploring GUI and shell integration
      1m 39s
  10. 3m 38s
    1. Selecting a software version control that is right for you
      2m 30s
    2. Next steps
      1m 8s

Watch this entire course now—plus get access to every course in the library. Each course includes high-quality videos taught by expert instructors.

Become a member
please wait ...
Fundamentals of Software Version Control
2h 55m Intermediate Nov 07, 2012

Viewers: in countries Watching now:

This course is a gateway to learning software version control (SVC), process management, and collaboration techniques. Author Michael Lehman reviews the history of version control and demonstrates the fundamental concepts: check-in/checkout, forking, merging, commits, and distribution. The choice of an SVC system is critical to effectively managing and versioning the assets in a software development project (from source code, images, and compiled binaries to installation packages), so the course also surveys the solutions available. Michael examines Git, Perforce, Subversion, Mercurial, and Microsoft Team Foundation Server (TFS) in particular, describing the appropriate use, features, benefits, and optimal group size for each one.

Topics include:
  • Comparing centralized vs. distributed systems
  • Saving changes and tracking history
  • Using revert or rollback
  • Working with the GUI tools
  • Using IDE and shell integration
  • Installing different systems
  • Creating a repository
  • Tagging code
  • Branching and merging code
  • Selecting a software version control system that's right for you
Subjects:
Developer Mobile Apps Desktop Apps Programming Foundations
Software:
Git Mercurial ALM/TFS Perforce
Author:
Michael Lehman

Branching and merging

The last major piece of functionality we need to explore is branching and merging. In Git, branching and merging is very easy and very lightweight. So first, let's run Git branch. We can see we are on the master branch. This is sometimes called the trunk. To create a branch is as easy as saying git branch b1, and now we have a new branch, you can see we have branches b1 and master. And you can see between the asterisk and the text in green, they we're on the master branch.

So in order to make changes in the branch and work with that, we need to check that branch out and then we can make updates. So git checkout b1, I can see it says we switch to branch b1. If we do git branch, you can see we are on branch b1, so now we'll go and update our file and add a new feature. One more haiku. "No available space," "Look to the cloud," "Your drive is full".

I will save that, we will exit, and then we'll commit that in the branch. Now if we say git log, you can see that we have the Update in branch, and you can see we have changed my novel to website, and we can see we have Initial check in. But there is nothing there that makes it clear that the update was done in the branch because the set of revisions is global between all the various different branches. So let's make another change, and we'll go specifically and make the commit message to show what is what we want to do.

So we'll say Notepad f1.c, and we'll come down here and change the word Website to Node, and save that, and we'll quit and then we'll do another commit, and we'll say b1 Change website to node. And there's a convention that's just handy to know which branch you are making the changes in. So now if we say git log, you can see it's very clear that that change was made in branch number one.

All right. Now let's talk about merging. If you continue to work in a branch for an extended period of time, you'll want to do a merge from your main branch back into your private branch. Remember, that's called a forward integration. Time to do this varies depending upon how active the main branch is. So usually I do that weekly if I am working in a project with somebody so that I make sure that my private branch is up to date in all the places where I am not currently working. Now in our case, we are simply going to do a reverse integration from our branch b1 back into the master.

So the way you do this is you first switch back to the master, and if we type f1.c, you can see we don't have our new feature, and it still says website. Now we are going to merge, git merge b1, and now if we type out f1.c, you can see it not only has the word Node, it also has our second function, feature1. You'll see one thing up at the top there where we did the git merge b1, it says Fast-forward, and that means that Git recognizes that b1 came off of a common starting point with our master branch, so therefore, it was able to replay the changes very, very quickly by knowing that it didn't have to like start looking at everything because it knew where they both began to differ.

Well, that's it for branching and merging in Git. Next up, we'll take a look at some shell integration and some GUI tools for Git that were installed when we installed the Git installation that we got from git-scm.com.

There are currently no FAQs about Fundamentals of Software Version Control.

 
Share a link to this course

What are exercise files?

Exercise files are the same files the author uses in the course. Save time by downloading the author's files instead of setting up your own files, and learn by following along with the instructor.

Can I take this course without the exercise files?

Yes! If you decide you would like the exercise files later, you can upgrade to a premium account any time.

Become a member Download sample files See plans and pricing

Please wait... please wait ...
Upgrade to get access to exercise files.

Exercise files video

How to use exercise files.

Learn by watching, listening, and doing, Exercise files are the same files the author uses in the course, so you can download them and follow along Premium memberships include access to all exercise files in the library.
Upgrade now


Exercise files

Exercise files video

How to use exercise files.

For additional information on downloading and using exercise files, watch our instructional video or read the instructions in the FAQ.

This course includes free exercise files, so you can practice while you watch the course. To access all the exercise files in our library, become a Premium Member.

join now Upgrade now

Are you sure you want to mark all the videos in this course as unwatched?

This will not affect your course history, your reports, or your certificates of completion for this course.


Mark all as unwatched Cancel

Congratulations

You have completed Fundamentals of Software Version Control.

Return to your organization's learning portal to continue training, or close this page.


OK
Become a member to add this course to a playlist

Join today and get unlimited access to the entire library of video courses—and create as many playlists as you like.

Get started

Already a member?

Become a member to like this course.

Join today and get unlimited access to the entire library of video courses.

Get started

Already a member?

Exercise files

Learn by watching, listening, and doing! Exercise files are the same files the author uses in the course, so you can download them and follow along. Exercise files are available with all Premium memberships. Learn more

Get started

Already a Premium member?

Exercise files video

How to use exercise files.

Ask a question

Thanks for contacting us.
You’ll hear from our Customer Service team within 24 hours.

Please enter the text shown below:

The classic layout automatically defaults to the latest Flash Player.

To choose a different player, hold the cursor over your name at the top right of any lynda.com page and choose Site preferencesfrom the dropdown menu.

Continue to classic layout Stay on new layout
Exercise files

Access exercise files from a button right under the course name.

Mark videos as unwatched

Remove icons showing you already watched videos if you want to start over.

Control your viewing experience

Make the video wide, narrow, full-screen, or pop the player out of the page into its own window.

Interactive transcripts

Click on text in the transcript to jump to that spot in the video. As the video plays, the relevant spot in the transcript will be highlighted.

Are you sure you want to delete this note?

No

Notes cannot be added for locked videos.

Thanks for signing up.

We’ll send you a confirmation email shortly.


Sign up and receive emails about lynda.com and our online training library:

Here’s our privacy policy with more details about how we handle your information.

Keep up with news, tips, and latest courses with emails from lynda.com.

Sign up and receive emails about lynda.com and our online training library:

Here’s our privacy policy with more details about how we handle your information.

   
submit Lightbox submit clicked
Terms and conditions of use

We've updated our terms and conditions (now called terms of service).Go
Review and accept our updated terms of service.