Programming 3 - Lesson 7

What is required for a three-way merge to occur?

• Two branches pointing to the same commit

• A branch with no commits

• Divergent development histories between branches

• A remote repository with more commits than the local repository

What command shows if an upstream branch has been defined for a local branch?

• git remote -v

• git branch -vv

• git log --oneline

• git status -v

What happens if you edit a file after adding it to the staging area?

• Git automatically updates the staged version

• Git prevents you from making additional changes

• Git marks the file as modified and you must add it again

• Git creates a new branch to track the second version

How many parent commits does a merge commit have?

• None

• One

• Two

• Three

What happens when you try to push changes when your local branch is out of sync with the remote branch?

• Git automatically performs a three-way merge

• Git shows an error and suggests fetching/pulling first

• Git creates a new branch for your changes

• Git overwrites the remote branch with your changes.

What command sets up an upstream branch?

• git upstream origin/main

• git branch -u origin/main

• git remote add upstream origin/main

• git push -u origin main

What is the benefit of defining an upstream branch?

• It prevents other users from pushing to the same branch

• It creates a backup of your local branch

• It allows you to use git push and git pull without arguments

• It automatically resolves merge conflicts

Which command fetches and merges changes from a remote repository in one step?

• git fetch

• git merge origin/main

• git pull

• git sync

When does a fast-forward merge occur instead of a three-way merge?

• When one branch is a direct continuation of the other

• When both branches have the same number of commits

• When working with more than two branches

• When there are no conflicts between branches

What does the command git remote -v display?

• The version of Git you're using

• All branches in the remote repository

• Remote repository connections

• Version history of all files