Rebasing and Resolving Conflicts

Question 1

Q: What is rebasing in Git?

Answer 1

A: Rebasing is a process of moving or combining commits to create a linear commit history.

Question 2

Q: How do you rebase the current branch onto another branch?

Answer 2

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

Question 3

Q: What is the difference between git merge and git rebase?

Answer 3

A: Merging preserves the commit history as-is, while rebasing rewrites it into a linear sequence.

Question 4

Q: How do you start an interactive rebase?

Answer 4

A: Use git rebase -i <base-commit>.</base-commit>

Question 5

Q: What does the term “base commit” mean in rebasing?

Answer 5

A: It refers to the commit where the rebase begins, typically the parent branch.

Question 6

Q: What are the actions you can perform in an interactive rebase?

Answer 6

A: Pick, reword, edit, squash, fixup, and drop.

Question 7

Q: What does “pick” mean during an interactive rebase?

Answer 7

A: It keeps the commit as-is.

Question 8

Q: What does “squash” mean during an interactive rebase?

Answer 8

A: It combines the commit with the previous one while keeping the commit messages.

Question 9

Q: What does “reword” mean during an interactive rebase?

Answer 9

A: It edits the commit message while keeping the changes.

Question 10

Q: What does “fixup” mean during an interactive rebase?

Answer 10

A: It combines the commit with the previous one without keeping the commit message.

Question 11

Q: What does “drop” mean during an interactive rebase?

Answer 11

A: It deletes the commit entirely from the history.

Question 12

Q: How do you resolve a conflict during a rebase?

Answer 12

A: Manually edit the conflicting files, stage the changes using git add, and continue the rebase with git rebase –continue.

Question 13

Q: How do you abort a rebase?

Answer 13

A: Use git rebase –abort.

Question 14

Q: What command shows the base commit shared between two branches?

Answer 14

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

Question 15

Q: How do you reapply stashed changes after a rebase?

Answer 15

A: Use git stash apply or git stash pop.

Question 16

Q: How do you skip a commit during a rebase if conflicts cannot be resolved?

Answer 16

A: Use git rebase –skip.

Question 17

Q: What does the –onto option do in rebasing?

Answer 17

A: It allows you to rebase a branch onto a different base branch or commit.

Question 18

Q: How do you perform a rebase to squash all commits into one?

Answer 18

A: Use git rebase -i <base-commit> and mark all commits except the first one as squash or fixup.</base-commit>

Question 19

Q: How do you ensure that a branch always rebase instead of merge when pulling?

Answer 19

A: Use git config pull.rebase true or git pull –rebase.

Question 20

Q: What are conflict markers in a file?

Answer 20

A: Conflict markers are «««<, =======, and&raquo_space;»»>, which indicate sections of code in conflict.

Question 21

Q: What does git diff show during a rebase conflict?

Answer 21

A: It shows the differences between the conflicting files and the base commit.

Question 22

Q: How do you view a list of ongoing rebase steps?

Answer 22

A: Use git status during a rebase to see the current state.

Question 23

Q: What happens to the commit hashes when you rebase?

Answer 23

A: Rebasing rewrites the commit history, so all rebased commits get new hashes.

Question 24

Q: How do you avoid rebasing branches that are shared with others?

Answer 24

A: Never rebase branches that have already been pushed to a remote and are used by others.

Question 25

Q: How do you rebase a branch to update it with the latest changes from the main branch?

Answer 25

A: Switch to the branch and use git rebase main.