Git & Version Control · Question Set

Branching Strategies & Merge vs Rebase — History Hygiene – Git & Version Control interview questions

Branching Strategies & Merge vs Rebase — History Hygiene interview questions for placements and exams.

Subject: Git & Version ControlDifficulty: Mixed14 questions in this set

Set overview

Questions

Included in this set

Subject

Git & Version Control

Explore more sets

Difficulty

Mixed

Level of this set

Git & Version Control – Branching Strategies & Merge vs Rebase — History Hygiene questions (14)

Go through each question and its explanation. Use this set as a focused practice pack for Git & Version Control.

Back to Git & Version Control subject page

1. You made a fixup commit with message `fixup! Parse config`. Which command auto-positions it during rebase?

Difficulty: MediumType: MCQTopic: Autosquash

`--autosquash` pairs `fixup!`/`squash!` commits with their targets in the todo list.

2. What does `git rerere` help with?

Difficulty: MediumType: MCQ

Continue your preparation

For complete preparation, combine this set with full subject-wise practice for Git & Version Control. You can also explore other subjects and sets from the links below.

Quick navigation:Git & Version Control subject page•All subjects

Master Interviews
Anywhere, Anytime

Branching Strategies & Merge vs Rebase — History Hygiene – Git & Version Control interview questions

Set overview

Git & Version Control – Branching Strategies & Merge vs Rebase — History Hygiene questions (14)

1. You made a fixup commit with message `fixup! Parse config`. Which command auto-positions it during rebase?

2. What does `git rerere` help with?

Continue your preparation

3. Which statement about merge vs rebase is MOST accurate?

4. What does `git merge --no-ff feature` do when a fast-forward would be possible?

5. How do you squash the last 3 commits into one with an edited message using interactive rebase?

6. Why is it unsafe to rebase public branches and when is it acceptable?

7. During a rebase you resolve conflicts. Which sequence continues correctly?

8. When would you use `git rebase --onto <newbase> <upstream> <branch>`? Give a practical example.

9. What is an octopus merge and when is it appropriate?

10. You accidentally finished a destructive rebase. How do you recover your previous branch state?

11. A team wants a clean linear main branch and to preserve PR context. Which policy fits best?

12. Compare Git Flow, GitHub Flow, and Trunk-based development. When would you prefer each?

13. What is the effect of using a platform’s “Squash and merge” option on a PR?

14. Which merge strategy option prefers current branch changes on conflicts?

More sets in Git & Version Control

Explore related subjects

Master Interviews Anywhere, Anytime

Branching Strategies & Merge vs Rebase — History Hygiene – Git & Version Control interview questions

Set overview

1. You made a fixup commit with message `fixup! Parse config`. Which command auto-positions it during rebase?

2. What does `git rerere` help with?

Continue your preparation

3. Which statement about merge vs rebase is MOST accurate?

4. What does `git merge --no-ff feature` do when a fast-forward would be possible?

5. How do you squash the last 3 commits into one with an edited message using interactive rebase?

6. Why is it unsafe to rebase public branches and when is it acceptable?

7. During a rebase you resolve conflicts. Which sequence continues correctly?

8. When would you use `git rebase --onto <newbase> <upstream> <branch>`? Give a practical example.

9. What is an octopus merge and when is it appropriate?

10. You accidentally finished a destructive rebase. How do you recover your previous branch state?

11. A team wants a clean linear main branch and to preserve PR context. Which policy fits best?

12. Compare Git Flow, GitHub Flow, and Trunk-based development. When would you prefer each?

13. What is the effect of using a platform’s “Squash and merge” option on a PR?

14. Which merge strategy option prefers current branch changes on conflicts?

More sets in Git & Version Control

Explore related subjects

Master Interviews
Anywhere, Anytime