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

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

Git Essential Training
Illustration by

Deleting branches


From:

Git Essential Training

with Kevin Skoglund

Video: Deleting branches

We've learned how to create branches, now we're going to learn how to delete them. I've already created several branches, git branch will show that list. Now regardless of whether you've the same ones as me or not, make sure that you switch to the master branch, so that's git checkout master. That will put you on a master branch with me. Once you are there, we're going to create a new branch, git branch, and then we just provide the name of the new branch that we wanted to create. We're going to call is one branch_to_delete. That will make it nice and clear. So git branch will now show that in the list.
Expand all | Collapse all
  1. 2m 46s
    1. Introduction
      1m 7s
    2. How to use the exercise files
      1m 39s
  2. 20m 24s
    1. Understanding version control
      4m 48s
    2. The history of Git
      7m 58s
    3. About distributed version control
      5m 4s
    4. Who should use Git?
      2m 34s
  3. 26m 12s
    1. Installing Git on a Mac
      3m 44s
    2. Installing Git on Windows
      5m 37s
    3. Installing Git on Linux
      1m 30s
    4. Configuring Git
      7m 29s
    5. Exploring Git auto-completion
      5m 35s
    6. Using Git help
      2m 17s
  4. 15m 49s
    1. Initializing a repository
      1m 58s
    2. Understanding where Git files are stored
      2m 34s
    3. Performing your first commit
      2m 4s
    4. Writing commit messages
      5m 22s
    5. Viewing the commit log
      3m 51s
  5. 17m 44s
    1. Exploring the three-trees architecture
      3m 57s
    2. The Git workflow
      3m 15s
    3. Using hash values (SHA-1)
      4m 7s
    4. Working with the HEAD pointer
      6m 25s
  6. 25m 52s
    1. Adding files
      5m 59s
    2. Editing files
      3m 56s
    3. Viewing changes with diff
      3m 35s
    4. Viewing only staged changes
      2m 28s
    5. Deleting files
      5m 29s
    6. Moving and renaming files
      4m 25s
  7. 19m 18s
    1. Introducing the Explore California web site
      2m 2s
    2. Initializing Git
      3m 48s
    3. Editing the support phone number
      6m 20s
    4. Editing the backpack file name and links
      7m 8s
  8. 38m 45s
    1. Undoing working directory changes
      3m 49s
    2. Unstaging files
      2m 37s
    3. Amending commits
      4m 50s
    4. Retrieving old versions
      4m 7s
    5. Reverting a commit
      3m 12s
    6. Using reset to undo commits
      3m 44s
    7. Demonstrating a soft reset
      4m 8s
    8. Demonstrating a mixed reset
      4m 7s
    9. Demonstrating a hard reset
      5m 8s
    10. Removing untracked files
      3m 3s
  9. 27m 22s
    1. Using .gitignore files
      8m 23s
    2. Understanding what to ignore
      4m 47s
    3. Ignoring files globally
      4m 49s
    4. Ignoring tracked files
      5m 26s
    5. Tracking empty directories
      3m 57s
  10. 26m 51s
    1. Referencing commits
      4m 52s
    2. Exploring tree listings
      3m 46s
    3. Getting more from the commit log
      7m 38s
    4. Viewing commits
      4m 4s
    5. Comparing commits
      6m 31s
  11. 39m 35s
    1. Branching overview
      4m 56s
    2. Viewing and creating branches
      2m 57s
    3. Switching branches
      2m 58s
    4. Creating and switching branches
      4m 53s
    5. Switching branches with uncommitted changes
      3m 26s
    6. Comparing branches
      4m 28s
    7. Renaming branches
      2m 28s
    8. Deleting branches
      4m 18s
    9. Configuring the command prompt to show the branch
      9m 11s
  12. 28m 32s
    1. Merging code
      3m 11s
    2. Using fast-forward merge vs. true merge
      6m 49s
    3. Merging conflicts
      7m 26s
    4. Resolving merge conflicts
      7m 5s
    5. Exploring strategies to reduce merge conflicts
      4m 1s
  13. 14m 34s
    1. Saving changes in the stash
      4m 5s
    2. Viewing stashed changes
      2m 39s
    3. Retrieving stashed changes
      4m 24s
    4. Deleting stashed changes
      3m 26s
  14. 1h 5m
    1. Using local and remote repositories
      6m 38s
    2. Setting up a GitHub account
      5m 39s
    3. Adding a remote repository
      4m 0s
    4. Creating a remote branch
      4m 3s
    5. Cloning a remote repository
      4m 26s
    6. Tracking remote branches
      4m 5s
    7. Pushing changes to a remote repository
      5m 8s
    8. Fetching changes from a remote repository
      5m 47s
    9. Merging in fetched changes
      4m 50s
    10. Checking out remote branches
      3m 22s
    11. Pushing to an updated remote branch
      2m 6s
    12. Deleting a remote branch
      3m 8s
    13. Enabling collaboration
      3m 40s
    14. A collaboration workflow
      8m 43s
  15. 16m 23s
    1. Setting up aliases for common commands
      5m 14s
    2. Using SSH keys for remote login
      2m 56s
    3. Exploring integrated development environments
      1m 4s
    4. Exploring graphical user interfaces
      4m 32s
    5. Understanding Git hosting
      2m 37s
  16. 55s
    1. Goodbye
      55s

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 ...
Git Essential Training
6h 26m Beginner Aug 24, 2012

Viewers: in countries Watching now:

The course shows how to use Git, the popular open-source version control software, to manage changes to source code and text files. Using a step-by-step approach, author Kevin Skoglund presents the commands that enable efficient code management and reveals the fundamental concepts behind version control systems and the Git architecture. Discover how to track changes to files in a repository, review previous edits, and compare versions of a file; create branches to test new ideas without altering the main project; and merge those changes into the project if they work out. The course begins by demonstrating version control in a single-user, standalone context, before exploring how remote repositories allow users to collaborate on projects effectively.

Topics include:
  • Exploring the history of version control
  • Installing Git on Mac, Windows, and Linux
  • Initializing a repository
  • Writing useful commit messages
  • Understanding the Git three-tree architecture
  • Tracking when files are added, edited, deleted, or moved
  • Viewing change sets and comparing versions
  • Undoing changes and rolling back to previous versions
  • Ignoring changes to select files
  • Creating and working with code branches
  • Merging branches and resolving merge conflicts
  • Stashing changes for later
  • Working with hosted repositories and remote branches
  • Developing an effective collaboration workflow
Subject:
Developer
Software:
Git GitHub
Author:
Kevin Skoglund

Deleting branches

We've learned how to create branches, now we're going to learn how to delete them. I've already created several branches, git branch will show that list. Now regardless of whether you've the same ones as me or not, make sure that you switch to the master branch, so that's git checkout master. That will put you on a master branch with me. Once you are there, we're going to create a new branch, git branch, and then we just provide the name of the new branch that we wanted to create. We're going to call is one branch_to_delete. That will make it nice and clear. So git branch will now show that in the list.

Notice that I'm still on the master branch. I did not create it and switch to it, I just created it, that's important. So now we want to delete it. It's really simple; git branch with the lowercase d option. So -d or you can use --delete if you'd rather. Most people just use the lower case d, and then the name of the branch that we want to delete. So git branch with the delete option, the branch to delete. We hit it, deleted branch, branch_to_delete, git branch, now that branch is gone.

And you may be saying wow, that's a pretty powerful thing! Obviously we would want to be careful and not accidentally delete something that we don't want to. That's certainly the case, anytime you are deleting anything, but git does have a few checks in place to make sure that you don't do something stupid. The first of those is let's create a new branch again, we will call it branch_to_delete a second time. So there it is, this time though, let's checkout that branch, get checkout branch to delete. So now I'm on that branch, now lets try delete it, git branch -d branch_to_delete, cannot delete it the branch that you are currently on.

So if we are there, we can't delete it. We have to get off of this branch first, before it'll lets us delete it. So make sure that it's not deleting everything that's in our working directory and somehow leaving us stranded not on a branch. We have to get on another branch, and then we can delete the old one. You can think of it a little bit like if you are in the tree with actual tree branches, you wouldn't want to cut off the branch that you were on, you want to switch to another branch before you sawed off the other tree branch. So that's the first check that it makes. Let me show you the next check that it makes. Let's say that we make a commit to this new branch.

So let's just do something real simple here, let's open up the index.html file, and let's change Welcome to Explore California to be Explore California: Tours and More. It's kind of silly but we have just been changing the title before, so we'll stick with that for now. It's a simple change we can make. We'll go ahead and commit that change. We'll use the dash -a option so that we don't have to add it in a separate step, and we'll just say changed title for now. We're going to delete this branch anyway, so it's not a big deal.

So git log --oneline, now you can see that commit the we've made. So I am on now my branch_to_delete. It won't let me delete it while I am on it, lets get off of it; git checkout, and let's do master. So now I am switched to master, git branch will show me that I am on my master branch. Now let's try and delete that other branch, git branch -d branch_to_delete, it comes up and says, woah, woah, woah, hold on. There are some things in there that are not in the branch that you're on now.

So I'm not comfortable just throwing away those commits. That might not be a smart thing to do. So you tell me if you really mean it, and you really want to do it, use capital D. Capital D will tell me that it's okay to throw away all those changes that are in that branch, but with lowercase D, it's sort of like we have a safety on it. It's going to check and make sure that we're not losing something. So the -D option, the branch must be fully merged into this branch with the -D option, then it'll delete the branch irrespective of its merged status.

So now let's use the -D option to tell it we really mean it. Now it's deleted, git branch, and you can see that it's gone. So it's pretty easy to delete branches but luckily git does give you a couple of checks to make sure that you don't do something dumb. So always use the lowercase -d option first and then let git tell you, hey, I want to warn you about something before I actually do this. And then you can change it for the capital D option, if that's what you really need.

Find answers to the most frequently asked questions about Git Essential Training.


Expand all | Collapse all
please wait ...
Q: In the Chapter 10 movie "Configuring the command prompt to show the branch," when I type the function "__git_ps1," I do not get the expected result.
A: The function "__git_ps1" was recently moved to a new file, .git-prompt.sh, as described here: https://github.com/git/git/commit/af31a456b4cd38f2630ed8e556e23954f806a3cc.

We will update the video. In the meantime, you may do the same steps you do for .git-completion.bash, but a second time using ".git-prompt.sh" as shown here: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh.
Q: When I use the code the instructor advises in the above video ("git config
--global user.name "Nelda Street"), I still get an "Illegal Instruction"
error. I have OS 10.6.8. Am I doing something wrong?
A: The current installer version of git isn't compatible with older Mac OS versions.
 
https://code.google.com/p/git-osx-installer/issues/detail?id=96
 
The workaround solutions people offer are:
 
1. To add "-mmacosx-version-min=10.6" as described here:
https://stackoverflow.com/questions/14268887/what-is-the-illegal-instruction-4-error-and-why-does-mmacosx-version-min-10
 
https://stackoverflow.com/questions/10177038/illegal-instruction-4-shows-up-in-os-x-lion
 
2. Or to use the version of git that comes with Xcode, or to use homebrew to install git instead.
http://superuser.com/questions/697144/installed-git-not-sure-how-to-get-it-working
 
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 Git Essential Training.

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.