Git Interview Questions:

Basic Git Questions

1. What is Git and why is it used?

   • Answer: Git is a distributed version control system designed to handle everything from small to very large projects with speed and efficiency. It is used for tracking changes in source code, enabling multiple developers to collaborate on a project.

2. Explain the difference between Git and GitHub.

   • Answer: Git is a version control system to manage code history, while GitHub is a cloud-based hosting service for Git repositories, providing a web interface for collaboration and project management.

3. What is a repository in Git?

   • Answer: A repository (or repo) is a storage location for your project files and the entire history of their changes. It can be local (on your computer) or remote (hosted on platforms like GitHub).

4. How do you initialize a new Git repository?

   • Answer: You can initialize a new Git repository by running git init in the root directory of your project.

5. How do you clone a repository?

   • Answer: You can clone a repository using git clone <repository_url>. This command creates a copy of the remote repository on your local machine.

GIT-NUTSHELL :

Credit @BRIJ_KISHORE_PANDEY

Intermediate Git Questions

6. Explain the difference betweengit fetch and git pull.

   • Answer:git fetch downloads commits, files, and references from a remote repository into your local repository without merging. git pull fetches and merges the changes from the remote repository into your current branch.

7. What are Git branches and why are they important?

   • Answer: Branches in Git are pointers to a specific snapshot of your changes. They allow you to develop features, fix bugs, or experiment in isolated environments. This makes it easier to manage multiple versions of a project.

8. How do you create a new branch in Git?

   • Answer: You can create a new branch using git branch <branch_name> and switch to it using git checkout <branch_name> or create and switch in one command with git checkout -b <branch_name>.

9. What is a merge conflict in Git and how do you resolve it?

   • Answer: A merge conflict occurs when changes from different branches clash and Git cannot automatically merge them. To resolve it, you need to manually edit the conflicting files and mark them as resolved with git add <file>.

10. Explain the purpose of thegit stash command.

    • Answer:git stash temporarily saves your uncommitted changes so you can switch branches or perform other tasks. You can later reapply these changes using git stash pop or git stash apply.

Advanced Git Questions

11. What is rebasing in Git and how is it different from merging?

    • Answer: Rebasing rewrites the commit history by placing your commits on top of another branch, creating a linear history. Merging combines commits from different branches, preserving the history of both branches.

12. When would you usegit rebase instead of git merge?

    • Answer: You would use git rebase to maintain a clean, linear project history. It is useful for incorporating changes from another branch before integrating into the main branch to avoid unnecessary merge commits.

13. How do you undo the last commit in Git?

    • Answer: You can undo the last commit with git reset --hard HEAD~1 to remove the commit and changes, or git reset --soft HEAD~1 to remove the commit but keep the changes in the working directory.

14. Explain the concept of a detached HEAD in Git.

    • Answer: A detached HEAD state occurs when you checkout a commit that is not associated with any branch. Changes made in this state are not associated with any branch unless you create a new branch from that commit.

15. How do you tag a commit in Git?

    • Answer: You can tag a commit using git tag <tag_name> to create a lightweight tag or git tag -a <tag_name> -m "message" to create an annotated tag with a message.

Practical Git Questions

16. How do you see the commit history for a repository?

    • Answer: You can view the commit history using git log. To see a simplified view, you can use git log --oneline.

17. How do you revert a commit that has already been pushed to a remote repository?

    • Answer: You can revert a commit using git revert <commit_hash>. This creates a new commit that undoes the changes from the specified commit.

18. What is the difference betweengit reset and git revert?

    • Answer:git reset moves the HEAD to a specific commit and can alter the commit history, potentially losing changes. git revert creates a new commit that undoes changes from a previous commit without altering the commit history.

19. How do you configure a Git repository to ignore specific files or directories?

    • Answer: You can configure a Git repository to ignore specific files or directories by adding their paths to a .gitignore file in the root of the repository.

20. What isgit cherry-pick and when would you use it?

    • Answer:git cherry-pick <commit_hash> applies the changes from a specific commit to your current branch. It is useful for applying selected commits from one branch to another without merging the entire branch.

Git Collaboration Questions

21. How do you create a pull request on GitHub?

    • Answer: To create a pull request on GitHub, push your changes to a branch on the remote repository, then navigate to the repository on GitHub, select the "Pull requests" tab, and click "New pull request". Choose the base branch and the compare branch, then create the pull request.

22. How do you handle multiple developers working on the same file in Git?

    • Answer: Multiple developers can work on the same file by creating separate branches. Changes can be merged later, and any conflicts can be resolved during the merge process.

23. Explain the concept of Git workflow.

    • Answer: A Git workflow defines how teams use Git for version control and collaboration. Common workflows include centralized workflow, feature branch workflow, Gitflow workflow, and fork-and-pull model.

24. How do you handle large binary files in a Git repository?

    • Answer: Large binary files should be handled using Git Large File Storage (LFS) which replaces large files with text pointers inside Git while storing the file contents on a remote server.

25. What is the difference betweengit fork and git clone?

    • Answer:git fork is a GitHub concept where you create a copy of a repository under your own account to work on. git clone is a Git command that creates a local copy of a remote repository.

Troubleshooting Git Questions

26. How do you resolve a detached HEAD state in Git?

    • Answer: To resolve a detached HEAD state, you can either checkout an existing branch using git checkout <branch_name> or create a new branch from the detached state using git checkout -b <new_branch_name>.

27. What are submodules in Git and how do you use them?

    • Answer: Submodules are repositories within a repository. You can add a submodule using git submodule add <repository_url>. This allows you to track external dependencies.

28. How do you squash commits in Git?

    • Answer: You can squash commits using git rebase -i <base_commit>. Mark the commits you want to squash as squash or s in the interactive rebase interface.

29. How do you rename a branch in Git?

    • Answer: To rename the current branch, use git branch -m <new_name>. To rename another branch, use git branch -m <old_name> <new_name>.

30. How do you remove a file from the Git history?

    • Answer: To remove a file from Git history, you can use git filter-branch --tree-filter 'rm -f <file>' HEAD or use the BFG Repo-Cleaner tool for a simpler approach.

Here are 20 additional Git interview questions with answers for someone with 5 years of experience in DevOps:

Advanced Git Questions

31. What is the purpose ofgit bisect and how does it work?

    • Answer:git bisect is used to find the commit that introduced a bug by performing a binary search through the commit history. You start with a known good commit and a known bad commit, and Git will help you find the exact commit where the issue was introduced.

32. Explain the difference betweengit merge --no-ff and git merge --ff-only.

    • Answer:git merge --no-ff creates a merge commit even if the merge could be performed with a fast-forward. This preserves the branch history. git merge --ff-only performs the merge only if it can be done with a fast-forward; otherwise, it aborts the merge.

33. What is the purpose of the.gitkeep file?

    • Answer: The .gitkeep file is not a built-in Git feature but a convention used to keep empty directories in a Git repository. Since Git does not track empty directories, adding a .gitkeep file ensures the directory is included in the repository.

34. How do you clean up a repository by removing untracked files?

    • Answer: You can clean up untracked files using git clean -f to remove untracked files and git clean -fd to remove untracked files and directories.

35. What is the reflog in Git and how is it useful?

    • Answer: The reflog records changes made to the tips of branches and other references. It is useful for recovering commits that are no longer referenced by any branch or tag.

Git Workflow and Collaboration

36. How do you handle code reviews in Git?

    • Answer: Code reviews in Git are typically handled using pull requests on platforms like GitHub, GitLab, or Bitbucket. Developers push their changes to a branch and create a pull request for team members to review, comment, and approve before merging.

37. What are Git hooks and how are they used?

    • Answer: Git hooks are scripts that run automatically at certain points in the Git workflow, such as before a commit or after a push. They are used to enforce policies, automate tasks, and integrate with other tools.

38. Explain the purpose of thepre-commit hook.

    • Answer: The pre-commit hook runs before the commit message editor is displayed and can be used to check the commit for compliance with coding standards, run tests, or check for other conditions that might prevent the commit.

39. What is a Git workflow you have used in your projects?

    • Answer: One common workflow is the Gitflow workflow, which uses feature branches for development, a develop branch for integration, and a master branch for releases. Hotfix branches are used for urgent fixes in the production code.

40. How do you enforce branch protection rules in a Git repository?

    • Answer: Branch protection rules can be enforced using repository hosting services like GitHub, GitLab, or Bitbucket. These rules can include restrictions on who can push to a branch, require pull request reviews, enforce status checks, and more.

Git Configuration and Optimization

41. How do you configure Git to use a specific text editor?

    • Answer: You can configure Git to use a specific text editor by setting the core.editor configuration option. For example, git config --global core.editor "code --wait" sets Visual Studio Code as the default editor.

42. What isgit gc and when should you use it?

    • Answer:git gc stands for "garbage collection" and is used to clean up unnecessary files and optimize the local repository. It should be used periodically to maintain repository performance, especially in large repositories.

43. How do you manage large files in Git repositories?

    • Answer: Large files can be managed using Git LFS (Large File Storage), which replaces large files with pointers in the Git repository while storing the actual files on a remote server.

44. What is the purpose of the.gitattributes file?

    • Answer: The .gitattributes file is used to define attributes for paths in the repository. It can control settings like end-of-line normalization, file diff handling, and custom merge strategies.

45. How do you set up Git to ignore file mode changes?

    • Answer: You can set up Git to ignore file mode changes by setting the core.fileMode configuration option to false using the command git config core.fileMode false.

Git Best Practices

46. How do you ensure consistent line endings across different operating systems in a Git repository?

    • Answer: Consistent line endings can be ensured by configuring Git to handle line endings using the core.autocrlf setting. Setting it to true on Windows and input on Unix-based systems ensures consistent line endings.

47. What is a commit message convention you follow and why is it important?

    • Answer: A common commit message convention is the Conventional Commits specification, which includes types like feat, fix, and chore followed by a short description. Consistent commit messages improve readability and help automate release notes.

48. How do you manage multiple remotes in a Git repository?

    • Answer: Multiple remotes can be managed by adding remote URLs using git remote add <name> <url>. You can fetch, pull, and push to these remotes using the remote name.

49. What is the purpose of thegit blame command?

    • Answer:git blame <file> shows who last modified each line of a file and the commit information, helping to identify the source of changes and understand the history of a file.

50. How do you secure your Git repository?

    • Answer: Security can be enhanced by using SSH keys for authentication, enforcing branch protection rules, using signed commits, and regularly reviewing repository access and permissions.

Troubleshooting and Recovery

51. How do you recover a deleted branch in Git?

    • Answer: A deleted branch can be recovered if it has not been garbage collected by finding its last commit in the reflog (git reflog) and recreating the branch with git checkout -b <branch_name> <commit_hash>.

52. What is the purpose ofgit fsck and when would you use it?

    • Answer:git fsck checks the integrity of the Git repository's database and identifies issues such as corrupted objects. It is useful for diagnosing and fixing repository corruption.

53. How do you handle a situation where a push is rejected due to non-fast-forward updates?

    • Answer: You can handle this situation by pulling the latest changes from the remote repository using git pull --rebase to reapply your commits on top of the latest changes, then pushing again.

54. Explain how to revert multiple commits in Git.

    • Answer: Multiple commits can be reverted using git revert <commit1> <commit2> ... to create individual revert commits for each specified commit, or by using an interactive rebase and squashing or editing commits.

55. How do you manage conflicting changes in a collaborative environment?

    • Answer: Conflicting changes can be managed by communicating with team members, using feature branches, performing regular merges or rebases to keep branches up-to-date, and resolving conflicts collaboratively during code reviews.

Advanced Usage

56. What is Git submodule and how do you use it?

    • Answer: Git submodules allow you to include and track external repositories within a parent repository. They are added using git submodule add <repository_url> <path>, and submodules are initialized and updated with git submodule update --init.

57. How do you configure Git to sign commits and why is it important?

    • Answer: Commits can be signed using GPG keys by configuring Git with git config --global user.signingkey <key_id> and signing commits with git commit -S. Signed commits verify the authenticity and integrity of the commits.

58. What are some common Git workflows and which one do you prefer?

    • Answer: Common Git workflows include Gitflow, feature branch, and trunk-based development. Preference depends on the team's needs and project complexity. Gitflow is often preferred for structured release management, while trunk-based is favored for continuous integration.

59. How do you handle a corrupted Git repository?

    • Answer: A corrupted repository can be handled by using git fsck to diagnose issues, recovering from backups, or recloning the repository if a remote copy exists. Resolving specific corrupt objects might involve replacing or regenerating them.

60. How do you migrate a project from another version control system to Git?

    • Answer: Migration involves exporting the project history from the existing VCS, using tools like git svn for Subversion or git fast-import for other systems, and setting up the Git repository with the imported history. Steps vary depending on the source VCS.