Tracking branches concept in Git - Commands & Configuration

Introduction

When you work with Git, you often want your local branch to follow changes from a branch on a remote server. Tracking branches help you keep your local work connected to the remote branch, so you can easily see new updates and share your changes.

When you clone a project and want your local main branch to follow the remote main branch automatically.

When you create a new branch locally and want it to track a branch on the remote repository for easy pushing and pulling.

When you want to check which remote branch your local branch is connected to.

When you want to fetch updates from the remote branch and merge them into your local branch.

When you want to push your local changes to the remote branch without specifying the branch name every time.

Commands

This command lists all local branches with information about their tracking status and the latest commit. It helps you see which branches are tracking remote branches.

Terminal

git branch -vv

Expected Output

  main       1a2b3c4 [origin/main] Initial commit

* feature    5d6e7f8 [origin/feature: ahead 2] Added new feature

→

-vv - Show verbose information including tracking branch and commit details

This command sets the local branch 'feature' to track the remote branch 'origin/feature'. It connects your local work to the remote branch for easier syncing.

Terminal

git branch --set-upstream-to=origin/feature feature

Expected Output

No output (command runs silently)

→

--set-upstream-to - Specify which remote branch the local branch should track

This command fetches changes from the remote branch your current branch is tracking and merges them into your local branch. It keeps your work up to date.

Terminal

git pull

Expected Output

Updating 5d6e7f8..9a0b1c2

Fast-forward

 file.txt | 2 ++

 1 file changed, 2 insertions(+)

This command pushes your local commits to the remote branch your current branch is tracking. It shares your changes with others without needing to specify the remote branch name.

Terminal

git push

Expected Output

Enumerating objects: 5, done.

Counting objects: 100% (5/5), done.

Delta compression using up to 4 threads

Compressing objects: 100% (3/3), done.

Writing objects: 100% (3/3), 350 bytes | 350.00 KiB/s, done.

Total 3 (delta 1), reused 0 (delta 0), pack-reused 0

To github.com:user/repo.git

   5d6e7f8..9a0b1c2  feature -> feature

Key Concept

If you remember nothing else from this pattern, remember: tracking branches link your local branch to a remote branch so you can easily sync changes without extra commands.

Common Mistakes

Not setting a tracking branch after creating a new local branch.

Without tracking, git pull and git push commands won't know which remote branch to sync with, causing errors or requiring manual branch names.

Use 'git branch --set-upstream-to=origin/branch-name local-branch' to link your local branch to the remote branch.

Assuming 'git pull' will always work without setting upstream.

If the local branch has no tracking branch, 'git pull' will fail with an error asking to specify the remote branch.

Set the upstream branch first or use 'git pull origin branch-name' explicitly.

Summary

Use 'git branch -vv' to see which local branches track remote branches and their status.

Set a tracking branch with 'git branch --set-upstream-to=origin/branch local-branch' to connect local and remote branches.

Once tracking is set, 'git pull' and 'git push' work smoothly without extra branch names.

Practice

1. What is the main purpose of a tracking branch in Git?

easy

A. To delete remote branches automatically

B. To create a backup of the repository

C. To link a local branch to a remote branch for easy syncing

D. To merge two unrelated branches

Solution

1. Step 1: Understand tracking branch concept

   A tracking branch connects your local branch to a remote branch, making syncing easier.

2. Step 2: Identify the main purpose

   This connection allows you to push and pull changes without extra typing.

3. Final Answer:

   To link a local branch to a remote branch for easy syncing -> Option C

4. Quick Check:

   Tracking branch = link local to remote [OK]

Hint: Tracking branches link local and remote branches automatically [OK]

Common Mistakes:

• Thinking tracking branches delete remote branches
• Confusing tracking branches with backups
• Assuming tracking branches merge unrelated branches

2. Which Git command correctly creates a new local branch feature that tracks the remote branch origin/feature?

easy

A. git branch feature origin/feature

B. git checkout --track origin/feature feature

C. git checkout origin/feature feature

D. git branch --track feature origin/feature

Solution

1. Step 1: Recall correct syntax for tracking branch creation

   The command to create a local branch tracking a remote branch is git branch --track local_branch remote_branch.

2. Step 2: Match the command with options

   git branch --track feature origin/feature matches this syntax exactly: git branch --track feature origin/feature.

3. Final Answer:

   git branch --track feature origin/feature -> Option D

4. Quick Check:

   Use --track with git branch to link branches [OK]

Hint: Use 'git branch --track' to link local to remote branch [OK]

Common Mistakes:

• Omitting --track option
• Using git checkout with wrong argument order
• Confusing branch creation with checkout syntax

3. Given the commands:

git checkout -b feature origin/feature
git branch -vv

What will the output show about the feature branch?

medium

A. feature branch tracks origin/feature with commit info

B. feature branch does not track any remote branch

C. feature branch is deleted

D. feature branch tracks origin/main

Solution

1. Step 1: Understand the checkout command

   git checkout -b feature origin/feature creates a local branch feature starting at origin/feature and sets it to track that remote branch.

2. Step 2: Interpret git branch -vv output

   This command shows local branches with tracking info and commit details. The feature branch will show it tracks origin/feature.

3. Final Answer:

   feature branch tracks origin/feature with commit info -> Option A

4. Quick Check:

   Checkout -b with remote sets tracking branch [OK]

Hint: Checkout -b with remote branch sets tracking automatically [OK]

Common Mistakes:

• Assuming no tracking is set by checkout -b
• Thinking branch is deleted after creation
• Confusing tracking branch with origin/main

4. You ran git branch --track feature origin/feature but got an error: fatal: A branch named 'feature' already exists.
What is the best way to fix this?

medium

A. Delete the existing feature branch first or use checkout to switch

B. Rename the remote branch

C. Run git branch --force feature origin/feature

D. Use git push to update the remote branch

Solution

1. Step 1: Understand the error message

   The error says a local branch named 'feature' already exists, so you cannot create it again.

2. Step 2: Choose the correct fix

   You can either delete the existing branch if not needed or switch to it using git checkout feature. Renaming remote or forcing branch creation is incorrect here.

3. Final Answer:

   Delete the existing feature branch first or use checkout to switch -> Option A

4. Quick Check:

   Existing branch blocks creation; delete or switch [OK]

Hint: Existing branch blocks creation; delete or checkout instead [OK]

Common Mistakes:

• Trying to rename remote branch unnecessarily
• Using --force incorrectly with git branch
• Confusing push with branch creation errors

5. You want to create a local branch dev that tracks origin/dev, but origin/dev does not exist yet. What happens if you run git checkout --track origin/dev?

hard

A. Git creates dev branch tracking origin/main instead

B. Git errors out because origin/dev does not exist

C. Git creates dev branch but does not track any remote

D. Git creates dev branch tracking origin/dev anyway

Solution

1. Step 1: Understand tracking branch creation requirements

   To create a tracking branch, the remote branch must exist. If it doesn't, Git cannot link to it.

2. Step 2: Predict Git behavior

   Running git checkout --track origin/dev when origin/dev does not exist causes Git to error out.

3. Final Answer:

   Git errors out because origin/dev does not exist -> Option B

4. Quick Check:

   Tracking branch requires existing remote branch [OK]

Hint: Remote branch must exist before tracking branch creation [OK]

Common Mistakes:

• Assuming Git creates tracking branch without remote
• Thinking Git tracks origin/main by default
• Ignoring error messages about missing remote branch