Branching and Merging

Question 1

Q: What is a branch in Git?

Answer 1

A: A branch is a separate line of development, allowing you to work on different features or fixes independently.

Question 2

Q: How do you list all branches in a repository?

Answer 2

A: Use git branch to list local branches and git branch -r for remote branches.

Question 3

Q: How do you create a new branch?

Answer 3

A: Use git branch <branch-name>.</branch-name>

Question 4

Q: How do you switch to an existing branch?

Answer 4

A: Use git checkout <branch-name> or git switch <branch-name>.</branch-name></branch-name>

Question 5

Q: How do you create and switch to a new branch in one command?

Answer 5

A: Use git checkout -b <branch-name> or git switch -c <branch-name>.</branch-name></branch-name>

Question 6

Q: How do you delete a branch locally?

Answer 6

A: Use git branch -d <branch-name> for a merged branch or git branch -D <branch-name> for an unmerged branch.</branch-name></branch-name>

Question 7

Q: How do you rename a branch?

Answer 7

A: Use git branch -m <old-name> <new-name>.</new-name></old-name>

Question 8

Q: How do you push a new branch to a remote repository?

Answer 8

A: Use git push -u origin <branch-name>.</branch-name>

Question 9

Q: How do you delete a branch on a remote repository?

Answer 9

A: Use git push origin –delete <branch-name>.</branch-name>

Question 10

Q: What is the default branch in most Git workflows?

Answer 10

A: The default branch is typically named main or master.

Question 11

Q: How do you merge a branch into the current branch?

Answer 11

A: Use git merge <branch-name>.</branch-name>

Question 12

Q: What is a fast-forward merge?

Answer 12

A: A fast-forward merge occurs when the branch being merged has no additional commits, so the branch pointer is simply moved forward.

Question 13

Q: How do you force a merge commit even if it can be fast-forwarded?

Answer 13

A: Use git merge –no-ff <branch-name>.</branch-name>

Question 14

Q: How do you resolve a merge conflict?

Answer 14

A: Manually edit conflicting files, stage the changes with git add, and then commit.

Question 15

Q: How do you view conflicts during a merge?

Answer 15

A: Look for conflict markers in the affected files («««<, =======,&raquo_space;»»>).

Question 16

Q: How do you abort an ongoing merge?

Answer 16

A: Use git merge –abort.

Question 17

Q: How do you check which branch you are currently on?

Answer 17

A: Use git branch or git status.

Question 18

Q: What is the HEAD pointer in Git?

Answer 18

A: HEAD points to the current branch or commit you are working on.

Question 19

Q: How do you check the merge base of two branches?

Answer 19

A: Use git merge-base <branch1> <branch2>.</branch2></branch1>

Question 20

Q: What is a feature branch?

Answer 20

A: A feature branch is a branch used to develop a specific feature independently before merging it into the main branch.

Question 21

Q: How do you rebase a branch onto another branch?

Answer 21

A: Use git rebase <branch-name> while on the branch you want to rebase.</branch-name>

Question 22

Q: What is the difference between merging and rebasing?

Answer 22

A: Merging combines branches while preserving their commit histories. Rebasing rewrites commit history to create a linear sequence.

Question 23

Q: How do you continue a rebase after resolving conflicts?

Answer 23

A: Use git rebase –continue.

Question 24

Q: How do you cancel an ongoing rebase?

Answer 24

A: Use git rebase –abort.

Question 25

Q: How do you create a branch that tracks a remote branch?

Answer 25

A: Use git checkout -b <branch-name> origin/<branch-name> or git switch --track origin/<branch-name>.</branch-name></branch-name></branch-name>