Rebase

Questions 1 to 5 of 6

1. 1. True or false: after git rebase main, your commits keep the same IDs, because only the branch name moves.

   False, because each replayed commit gets a new parent, so Git writes it again with a new IDTrue, because Git hashes only the message and the files, and those did not changeTrue, because the commits stay where they are and a new branch name points at them
2. 2. Spot the bug in this sequence. A teammate pushed add-menu yesterday and is still working on it. ``bash git switch add-menu git rebase -i HEAD~1 git push --force origin add-menu `` What is wrong?

   The -i flag cannot be used with HEAD~1The force push overwrites the commits the teammate pushed, so their copy no longer matches the shared branchThe push should come before the rebase, so the remote gets the new commit IDsNothing is wrong, because a rebase never changes commit IDs
3. 3. True or false: if a rebase goes wrong, git rebase --abort keeps the commits that were already replayed and finishes the rest.

   True, because abort continues the rebase from the last conflictTrue, because the replayed commits are already saved on the branchFalse, because abort returns the branch to exactly how it was before the rebase started
4. 4. You want to combine a small Fix typo commit into the commit above it, and keep only the message of the commit above. Which word do you put in place of pick on the Fix typo line of git rebase -i?

   squashreworddropfixup
5. 5. A rebase stops with a conflict. In the marked section, the part between <<<<<<< HEAD and ======= is which version?

   The branch you are rebasing onto, such as mainYour commit that is being replayedThe stash entry you saved earlier with git stashThe copy of the branch on the remote, such as origin/main