Git-info

A remote repository usually refers to: A repository stored only on your computer. A repository stored in a shared server like GitHub. A repository without commit history.

git add is used to: Permanently delete files. Move changes to the staging area. Upload files to GitHub directly.

Which is the correct order in the commit lifecycle?. commit → add → push. add → push → commit. add → commit → push.

What does the .git folder contain?. Cache files. The entire repository history and configuration. Copies of old backups.

Git tracks: Only file names. File content changes over time. Permissions only.

git status shows: Current branch, staged changes, unstaged changes. Remote repository size. Internet connection status.

The staging area is: Where files are stored after pushing. A temporary area before committing. A backup of deleted files.

What does git clone do?. Copies a remote repo to your machine. Creates a new remote repository. Deletes a local repo.

HEAD usually points to: The oldest commit. The latest commit on the current branch. The remote repository.

git push: Saves changes to your local repository. Sends commits to the remote repository. Creates a new branch.

Which command correctly creates a new branch called feature/auth?. git new feature/auth. git branch feature/auth. git start feature/auth.

What is the fastest way to create and switch to a branch named fix/header?. git branch fix/header && git switch fix/header. git checkout -b fix/header. git push fix/header.

Which command switches your working directory to an existing branch?. git move. git checkout <branch>. git select <branch>.

New branches are always created from: The remote HEAD. The currently checked-out commit. The oldest commit.

A local branch is: A branch on your computer only. A branch available to everyone. A branch without commit history.

A remote branch refers to: A backup copy of your local repo. A branch stored on GitHub or GitLab. A temporary branch created for stashing.

What is a “tracking branch”?. A copy of a remote branch that updates automatically. A branch that Git ignores. A branch used only for tagging.

How do you create a remote branch from a local one?. git push origin <branch>. git remote add <branch>. git new remote <branch>.

To download a remote branch you don’t have locally, you run: git get. git checkout <remote-branch>. git clone.

Which branch name follows good convention?. bug-fix. randomStuff. fix/login-error-204.

Which prefix is commonly used for feature branches?. test/. feature/. model/.

A branch used to fix a production issue commonly uses the prefix: hotfix/. dev/. fixme/.

Trunk-based development encourages: Long-lived branches. Small, frequent commits to main. Multiple release branches.

GitFlow promotes: Very short-lived branches. Many long-lived branches (develop, release, hotfix). No branching at all.

GitFlow is ideal when: You release multiple times per day. You need structured, versioned releases. The team has only one developer.

A fast-forward merge occurs when: The branches have diverged with different commits. The target branch has no new commits, so Git can simply move the pointer forward. Git needs to create a new merge commit.

Which scenario allows a fast-forward merge?. Main has progressed and feature also has new commits. Both branches have different histories. Main has stayed still, only the feature branch advanced.

Which command performs a fast-forward merge by default?. git merge feature. git merge --no-ff. git merge --conflict.

Fast-forward merges: Always create a merge commit. Never create a merge commit. Sometimes create merge commits.

Which option forces Git to create a merge commit even if fast-forward is possible?. git merge --force. git merge --no-ff. git merge --new-commit.

What is one main advantage of fast-forward merges?. They create clear, visible merge commits. They keep the commit history linear and clean. They prevent all merge conflicts.

In which situation is fast-forward merging not ideal?. When you want to keep a record that a feature branch existed. When the branch is very short. When the team uses trunk-based development.

What does the base version represent in a 3-way merge?. The most recent commit on the target branch after merging. The common ancestor commit from which both branches diverged. The version stored on the remote repository.

A 3-way merge can automatically resolve changes when both branches modified different parts of the same file. True. False.

When you see conflict markers <<<<<<<, =======, >>>>>>> in a file after merging, what does the middle section between ======= and >>>>>>> represent?. The base (common ancestor) version. The incoming branch’s version (the branch you are merging into your current branch). Your current branch’s version (HEAD).

Which of the following best explains why 3-way merge reduces unnecessary conflicts compared to a simplistic two-way comparison?. It only compares the most recent commit on each branch and ignores history. It only compares the most recent commit on each branch and ignores history. It creates a temporary branch that overrides both branches.

When resolving a 3-way merge conflict, choosing “Accept Incoming” without checking the base is always safe. True. False.

Which situation will most likely cause a 3-way merge conflict?. Two branches each changed different functions in the same file (different lines). Two branches both modified the exact same lines of a configuration file. One branch added new files while the other made commits to unrelated files.

What is the recommended manual approach when you encounter a 3-way merge conflict?. Immediately choose either current or incoming without reading, then commit. Inspect the base plus both branch versions, decide how to combine or rewrite the section, test if applicable, then mark resolved and commit. Delete the conflicted file and recreate it later.