Tracking branches concept in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

🧠 Conceptual

intermediate

What is a tracking branch in Git?

In Git, what does a tracking branch do?

A It is a branch that stores all the commit history of the repository without any connection to remotes.

B It is a branch that only exists on the remote repository and cannot be checked out locally.

C It is a temporary branch created during a merge conflict resolution.

D It is a local branch that automatically syncs with a remote branch, making it easier to pull and push changes.

💡 Hint

Think about how Git helps you keep your local work updated with changes from others.

A tracking branch is a local branch that is linked to a remote branch. This link allows Git to know where to pull updates from and where to push your changes, simplifying collaboration.

💻 Command Output

intermediate

Output of 'git branch -vv' showing tracking branches

What is the output of the command git branch -vv when you have a local branch feature tracking origin/feature with one commit ahead?

Git

git branch -vv

A * feature 123abc4 [origin/feature] Added new feature

B * feature 123abc4 Added new feature

C * feature 123abc4 [origin/feature: ahead 1] Added new feature

D * feature 123abc4 [origin/feature: behind 1] Added new feature

💡 Hint

Look for the branch name, commit hash, tracking info, and commit message.

The -vv option shows verbose info including the remote branch tracked and if the local branch is ahead or behind. Here, the local branch feature is ahead by one commit.

🔀 Workflow

advanced

Setting up a tracking branch for a new remote branch

You cloned a repository and want to start working on a new remote branch bugfix that was just created. Which command correctly sets up a local tracking branch bugfix to track origin/bugfix?

A git checkout -b bugfix origin/bugfix

B git branch bugfix

C git checkout bugfix

D git fetch origin bugfix

💡 Hint

Think about how to create a local branch that tracks a remote branch in one step.

The command git checkout -b bugfix origin/bugfix creates a new local branch bugfix and sets it to track the remote branch origin/bugfix. Other options either don't create tracking or don't create the branch locally.

❓ Troubleshoot

advanced

Why does 'git pull' fail on a tracking branch?

You are on a local branch develop tracking origin/develop. Running git pull gives the error: There is no tracking information for the current branch. What is the most likely cause?

A The local branch <code>develop</code> is not actually set to track <code>origin/develop</code>.

B The remote repository <code>origin</code> is unreachable due to network issues.

C You have uncommitted changes that prevent pulling.

D The <code>git pull</code> command is deprecated and should be replaced with <code>git fetch</code>.

💡 Hint

Check if the branch has a remote branch linked.

This error means Git does not know which remote branch to pull from because the local branch is not set to track any remote branch. This can happen if the branch was created without linking to a remote.

✅ Best Practice

expert

Best practice for renaming a tracking branch

You want to rename your local tracking branch feature-old to feature-new while keeping the tracking relationship with origin/feature-old. Which sequence of commands achieves this correctly?

A git branch -m feature-old feature-new && git push origin feature-new && git branch --set-upstream-to=origin/feature-new feature-new

B git branch -m feature-old feature-new && git branch --unset-upstream feature-new && git branch -u origin/feature-old feature-new

C git checkout feature-old && git branch -m feature-new && git push origin feature-new

D git branch -m feature-old feature-new && git push origin :feature-old feature-new

💡 Hint

Think about renaming locally and then updating the tracking info without pushing changes to remote branches.

Renaming the branch locally with git branch -m changes the branch name. The tracking info must be unset and then reset to keep tracking the original remote branch origin/feature-old. Other options either push or set wrong upstream branches.