Question 1

How do you undo the last commit in Git?

Accepted Answer

To undo the last commit but keep changes in the working directory, use `git reset --soft HEAD^`. For a complete rollback (discarding changes), use `git reset --hard HEAD^`.
- `--soft` preserves staged changes.
- `--hard` deletes them permanently.

Question 2

What is the Git workflow you’ve used in a team setting?

Accepted Answer

A common workflow is Git Flow: `main` for production, `develop` for integration, feature branches for tasks, and hotfix branches for urgent fixes.
- Encourages collaboration and clear release cycles.
- Requires discipline in branching and merging.

Question 3

How do you merge two branches in Git?

Accepted Answer

To merge branches, switch to the target branch (e.g., `main`) with `git checkout main`, then run `git merge ` to combine changes from `` into `main`. - If conflicts arise, Git pauses the merge for manual resolution. - After resolving, commit the changes to complete the merge.

Question 4

What is the difference between `git fetch` and `git pull`?

Accepted Answer

`git fetch` downloads updates from the remote repository without merging them, while `git pull` fetches and merges them into the current branch.
- `fetch` lets you review changes first.
- `pull` is a quicker, automated sync.

Question 5

How do you resolve a detached HEAD state in Git?

Accepted Answer

A detached HEAD occurs when you checkout a commit instead of a branch. To resolve:
- Create a new branch with `git checkout -b new-branch` to save work.
- Or return to a branch with `git checkout main` if no changes are needed.

Question 6

What is a merge conflict and how do you resolve it?

Accepted Answer

A merge conflict occurs when Git cannot automatically reconcile changes from two branches (e.g., edits to the same line). To resolve:
- Open the conflicting files, edit to reconcile changes.
- Mark as resolved with `git add <file>`.
- Complete the merge with `git commit`.

Question 7

What is a Git branch and how do you create one?

Accepted Answer

A Git branch is a separate line of development, allowing you to work on features or fixes without affecting the main codebase. To create a branch, use `git branch ` or `git checkout -b ` to create and switch to it. - Branches are lightweight pointers to commits. - They enable parallel development.

Question 8

How do you amend the last commit message?

Accepted Answer

To amend the last commit message, use `git commit --amend`. If no new changes are staged, it updates the message; otherwise, it includes staged changes too.
- Run `git commit --amend -m 'New message'` for a quick fix.
- Avoid on pushed commits to prevent confusion.

Question 9

What is a Git stash and how do you use it?

Accepted Answer

`git stash` temporarily saves uncommitted changes, allowing you to switch branches or tasks without committing. To stash, run `git stash push`; to retrieve, use `git stash pop`.
- Great for quick context switching.
- Stashes are stored in a stack.

DeVlt

Medium Git Interview Questions

Unlock All Interview Questions

Why Practice Medium Git Questions?

DeVlt