Easy-to-follow video tutorials help you learn software, creative, and business skills.Become a member

Terminology

From: Fundamentals of Software Version Control

Video: Terminology

Before we proceed into talking more about centralized and distributed version control, it's time to add a few more terms to our lexicon. Here is the terms we've already discussed: repository, the database where your changes are tracked; working set, your local files with potential changes not yet in the repository; add and check in, ways of getting data in to the repository; check-out and update, ways of getting data from the repository into your working set; and revert or rollback, ways of updating your working set to match specific versions of the repository.

Terminology

Before we proceed into talking more about centralized and distributed version control, it's time to add a few more terms to our lexicon. Here is the terms we've already discussed: repository, the database where your changes are tracked; working set, your local files with potential changes not yet in the repository; add and check in, ways of getting data in to the repository; check-out and update, ways of getting data from the repository into your working set; and revert or rollback, ways of updating your working set to match specific versions of the repository.

Distributed Repository Systems have the ability to take the contents of an entire repository, or the contents of a particular changeset, and send it to other users collaborating on the same project. When sending changes from one repository to another, you can do it via two methods, one is to use a method which uses HTTP or SSH to communicate the information to a remote server, the other is a way of extracting data from a repository to be able to send by email. So, when sending changes from one repository to another repository on a server, the terms are called push and pull.

Push sends the changes from your repository to the server's repository, and pull gets the changes from the server and adds them to your local repository. As I said, this is almost often done via a server listing on HTTP or via SSH. If you wish to send your changes privately using email, you can do the same thing, but the terms are called import and export. You export from a repository which extracts the changes from your repository and puts them in a file that you can send as an attachment, and conversely, import allows you to take that file that somebody else sends you as an attachment and update your local repository.

One of the most important features in a Version Control Software is the ability to name the specific state of a repository. This, as I said before, is called tagging or labeling. This allows you to say all the files that I have in this particular repository ,or all the files that I have in this project in a repository or in a well-known state, and I want to be able to get back to the state later. For example, when you ship version 1 before you begin to work on version 2, and 2 months later your customers says I need to make a change in version 1 right now and can't wait for version 2, you want to be able to get back to that exact state of version 1 so that you can make that update so that you can extract all the files that represent the state of your product or website or composition as a version 1, make some changes, and saves them back in a way that's separate from what the new stuff you're working on version 2.

Sometimes when you're working on a project, you want to do some experiments, and we'll say what if I re-factor this particular function, or what if we redid the size of the website, or what if we decided to take out this chorus and add another bridge in the song? Version Control Software allows you to make a copy of your entire repository and work on this in a private sandbox. This is called branching or forking. Once you've done all your experimental work, you may decide that this is exactly what you want, and wish to add your changes back into the main portion of your source code.

This is called merging. The thing that you branched from is oftentimes called the main branch or sometimes called the trunk. So what you want to do when you merge is integrate from your private branch back into the trunk or into the main branch. Sometimes you do this because your product is composed of a lot of pieces, and you want to be able to work on the individual pieces separately. For example, you might have an app that has an image processing component and an audio component, and two different developers work on each of these pieces. So, in this case, you would create two branches, one for the image processing developer to use, and one for the audio recording developer to use.

Then when the image processing developer completes her work, she merges her future updates back into the main trunk. This is a special kind of merging called reverse integration. If the audio developer has also done a reverse integration and merged updates back into the main branch, the image processing developer may want to get those changes before proceeding on and making additional changes. So, she can grab the updates from the main branch in a process that's called forward integration, which is kind of like creating a new branch. It simply takes the changes from the main trunk and puts them into her private branch.

And similarly, the audio developer can do the same thing with the image processing changes. We'll see this both conceptually and in action later in the course.

Show transcript

This video is part of

Image for Fundamentals of Software Version Control
Fundamentals of Software Version Control

49 video lessons · 11598 viewers

Michael Lehman
Author

 
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

Start learning today

Get unlimited access to all courses for just $25/month.

Become a member
Sometimes @lynda teaches me how to use a program and sometimes Lynda.com changes my life forever. @JosefShutter
@lynda lynda.com is an absolute life saver when it comes to learning todays software. Definitely recommend it! #higherlearning @Michael_Caraway
@lynda The best thing online! Your database of courses is great! To the mark and very helpful. Thanks! @ru22more
Got to create something yesterday I never thought I could do. #thanks @lynda @Ngventurella
I really do love @lynda as a learning platform. Never stop learning and developing, it’s probably our greatest gift as a species! @soundslikedavid
@lynda just subscribed to lynda.com all I can say its brilliant join now trust me @ButchSamurai
@lynda is an awesome resource. The membership is priceless if you take advantage of it. @diabetic_techie
One of the best decision I made this year. Buy a 1yr subscription to @lynda @cybercaptive
guys lynda.com (@lynda) is the best. So far I’ve learned Java, principles of OO programming, and now learning about MS project @lucasmitchell
Signed back up to @lynda dot com. I’ve missed it!! Proper geeking out right now! #timetolearn #geek @JayGodbold
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.


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.

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

Your file was successfully uploaded.

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.