CompTIA Linux+ XK0-006 (V8) Practice Question

The git merge --squash <branch> command takes all commits from the specified branch, combines their changes, and stages them for a new commit on the current branch. It does not create a merge commit itself or alter the history of the source branch. A subsequent git commit command creates a single new commit, satisfying the requirement for a concise history.

git merge --no-ff <branch> creates an explicit merge commit, preserving all the individual commits from the feature branch in the history instead of collapsing them. An interactive rebase (git rebase -i) on the feature-login branch would rewrite that branch's public history, which the scenario explicitly forbids. Running git cherry-pick feature-login would only apply the single commit from the tip of the branch, not all of its commits, and would not squash them.