How is rebase used in relation to a merge?

How is rebase used in relation to a merge?

• A. A rebase is the same as a merge.
• B. A rebase lets you move from a fast-forward to a recursive merge scenario.
• C. A rebase enables you to move from a recursive to a fast-forward merge scenario.
• D. A rebase lets you select the merge strategy you would like to use.

Answer: (B)

Rebase rewrites commit history by replaying commits from one branch on top of another branch’s tip. That changes the base point where those commits sit, so the relationship between branches can shift. Because the merge type depends on how the histories line up, rebasing can alter whether a merge can be done as a simple fast-forward or requires a full merge commit to reconcile differences. If a branch could previously be merged into another with a fast-forward, rewriting history on that path can break that direct lineage, making the merge no longer a fast-forward and necessitating a recursive merge to combine the histories properly. In short, rebasing can transform a fast-forward merge scenario into one that requires a merge commit to resolve divergent histories.

Rebase rewrites commit history by replaying commits from one branch on top of another branch’s tip. That changes the base point where those commits sit, so the relationship between branches can shift.

Because the merge type depends on how the histories line up, rebasing can alter whether a merge can be done as a simple fast-forward or requires a full merge commit to reconcile differences. If a branch could previously be merged into another with a fast-forward, rewriting history on that path can break that direct lineage, making the merge no longer a fast-forward and necessitating a recursive merge to combine the histories properly. In short, rebasing can transform a fast-forward merge scenario into one that requires a merge commit to resolve divergent histories.