Which term describes integrating changes from different branches into a single branch?

Which term describes integrating changes from different branches into a single branch?

• A. Commit
• B. Merge
• C. Rebase
• D. Checkout

Answer: (B)

Merging is the process of bringing together changes from different branches into one branch. When you merge, you take the history from the other branch and combine it with the current branch, often creating a new merge commit that records that both histories now exist in a single place. This preserves all the work done on both sides and shows that their changes have been integrated. This differs from a commit, which is just saving a set of changes to the current branch without bringing in work from another branch. Rebase, while also integrating changes, does so by replaying commits from one branch onto another, effectively rewriting history to create a linear sequence. It’s not simply about combining branches in the same way a merge does. Checkout is about switching which branch you’re looking at or working on, not about integrating changes.

Merging is the process of bringing together changes from different branches into one branch. When you merge, you take the history from the other branch and combine it with the current branch, often creating a new merge commit that records that both histories now exist in a single place. This preserves all the work done on both sides and shows that their changes have been integrated.

This differs from a commit, which is just saving a set of changes to the current branch without bringing in work from another branch. Rebase, while also integrating changes, does so by replaying commits from one branch onto another, effectively rewriting history to create a linear sequence. It’s not simply about combining branches in the same way a merge does. Checkout is about switching which branch you’re looking at or working on, not about integrating changes.