Checkpoint: Branching and Merging

Question 1 of 5

• It’s lost, because switching resets the working tree.
• It comes with you to main as an uncommitted change.
• Git always refuses to switch while you have uncommitted changes.
• It’s committed to hero-image automatically before the switch.

Question 2 of 5

• You’re currently on old-layout, so it can’t be deleted.
• The branch doesn’t exist locally.
• GitHub is unreachable, so Git can’t check the branch.
• Some of its commits aren’t merged into your current branch; merge them, or use -D if you’re sure they’re unwanted.

Question 3 of 5

• git merge --abort
• git reset --hard main
• git rebase --abort
• git rebase --skip

Question 4 of 5

• Merge main into redesign and push.
• Rebase redesign onto main and git push --force.
• Delete redesign and recreate it from main.
• Run git reset --hard main on redesign.

Question 5 of 5

• git restore --ours styles.css, then git add styles.css
• git merge --abort
• Delete styles.css and run git commit.
• git restore --theirs styles.css, then git add styles.css and git commit