Question 1

What is the difference between git fetch and git pull?

Accepted Answer

`git fetch` only downloads the latest changes from the remote tracking branches but doesn't merge them into your local branches. `git pull` is a combination of `git fetch` followed by `git merge`.

Question 2

How do you resolve a merge conflict in Git?

Accepted Answer

1. Identify files with conflicts (`git status`). 2. Open the files and manually choose between changes (look for `<<<<<<<`, `=======`, `>>>>>>>`). 3. Save the file and stage it (`git add `). 4. Complete the merge (`git commit`).

Question 3

What is "rebasing" in Git?

Accepted Answer

Rebasing is the process of moving or combining a sequence of commits to a new base commit. It rewrites project history by creating new commits for each commit in the original branch. It results in a cleaner, linear project history.

Git Top Q&A

What is the difference between git fetch and git pull?

How do you resolve a merge conflict in Git?

What is "rebasing" in Git?

Master Git Documentation

Complete Git Tutorial

Git Command Sheet