Branching Merging Workflows MCQs with Answers and Explanations

git merge combines branches while preserving all commit history, creating a merge commit. git rebase rewrites commits by replaying them on top of another branch, creating a linear history without merge commits.

Trunk-based development is a source control practice where developers integrate small, frequent commits into a single main branch (trunk). It promotes CI, reduces merge conflicts, and is a prerequisite for effective continuous integration.

Gitflow is a Git branching model that uses a develop branch for ongoing development alongside the main branch. It also uses feature, release, and hotfix branches to manage the full release lifecycle.

git merge integrates changes from one branch into the current branch. It is commonly used to combine feature branches back into the main or develop branch.