CDM Version Control & Collaboration

Question 1

Which Git branching strategy uses two long-lived branches — 'main' and 'develop' — along with supporting feature, release, and hotfix branches?

Accepted Answer

Gitflow

Answer

Gitflow, introduced by Vincent Driessen, defines two permanent branches (main and develop) plus temporary supporting branches for features, releases, and hotfixes.

Question 2

In Trunk-Based Development, how frequently should developers integrate their changes into the main branch?

Accepted Answer

At least once per day

Answer

Trunk-Based Development requires developers to commit small, incremental changes to the trunk (main branch) at least once per day to minimize integration pain.

Question 3

What is the primary purpose of a pull request (PR) in a collaborative Git workflow?

Accepted Answer

To propose and review changes before merging into a target branch

Answer

A pull request is a collaboration mechanism that allows developers to propose changes, discuss them, request reviews, and merge code only after approval.

Question 4

Which Git command is used to apply a specific commit from one branch onto another branch without merging the entire branch history?

Accepted Answer

git cherry-pick

Answer

git cherry-pick applies the changes introduced by an existing commit onto the current branch, allowing selective porting of individual commits.

Question 5

What does 'git rebase' do compared to 'git merge' when integrating changes from a feature branch?

Accepted Answer

Rebase rewrites commit history to produce a linear history; merge preserves divergent history with a merge commit

Answer

git rebase replays commits on top of a new base, producing a linear history, whereas git merge creates an explicit merge commit that shows where branches joined.

(CDM) Certified DevOps Master Practice Test

(CDM) Certified DevOps Master Practice Test

CDM Version Control & Collaboration