A finished feature branch that adds Meraki SSID helpers should join the shared development line while keeping both histories visible. Which official Git operation is the correct way to combine the branch?
Select an answer to reveal the explanation.
Short Explanation
Merging is like connecting a side trail back to the main path and leaving the trail markers. When the feature is done, merge brings it into the shared line. Cherry-pick or squash are not the official DEVCOR 1.10.a answer here.
Full Explanation
Topic 1.10.a names merging a branch as the operation to combine completed work into the shared line of development. Fast-forward applies when history is linear; otherwise a merge commit preserves both histories. Cherry-pick and squash are outside this blueprint’s official list for the combine step.