Question 1

What is the difference between git merge and git rebase?

Accepted Answer

Merge combines two branches and creates a merge commit, keeping the full history. Rebase replays your commits on top of another branch, producing a straight history with new commit hashes. Rebase your own local work before sharing it. Merge shared branches, because rebasing commits others have already pulled causes conflicts for them.

Question 2

What is a pull request on GitHub?

Accepted Answer

A pull request is a request to merge changes from one branch into another, usually from a feature branch into main. It shows the differences, lets teammates comment and review, and runs any checks before the merge. It is the main way teams review code before it changes the shared branch, so it is a common topic in team-based interviews.

Git & GitHub