Utilize Advanced Version Control Operations with Git 350-901 Practice Questions (Page 1)

Questions 1–5

1. 1expert · hard

   A developer has been working on a feature branch and has made several commits. They realize the last commit contains a mistake and want to undo it, but they also have uncommitted changes in the working directory that they want to keep. They want to remove the last commit from the branch history but preserve the uncommitted changes. Which command should they run?

   • Agit reset --soft HEAD~1
   • Bgit reset --mixed HEAD~1
   • Cgit revert HEAD
   • Dgit reset --hard HEAD~1
   Reveal Solution Discussion Select an answer first
2. 2foundation · easy

   A developer is on the main branch and runs `git merge feature-x`. The main branch has not diverged since feature-x was created; it is simply a few commits behind. Which type of merge will Git perform by default?

   • AA squash merge that combines all feature-x commits into one
   • BA fast-forward merge that moves main's pointer to feature-x's tip
   • CA rebase of feature-x onto main before merging
   • DA three-way merge that creates a merge commit
   Reveal Solution Discussion Select an answer first
4. 3application · easy

   A developer has a feature branch that has not diverged from main; main has no new commits since the feature branch was created. The developer wants to integrate the feature branch into main. What will happen when they run git merge feature-branch while on main?

   • AGit will create a new commit on main that duplicates the feature branch's changes
   • BGit will refuse to merge because the branches have not diverged
   • CGit will create a merge commit to record the integration
   • DGit will perform a fast-forward merge, moving main's pointer to the feature branch's tip without creating a merge commit
   Reveal Solution Discussion Select an answer first
5. 4application · medium

   A developer is working on a feature branch that has diverged from main. They want to integrate main's changes into their feature branch to test compatibility before merging back. They want to avoid creating a merge commit in their feature branch's history. Which command should they use?

   • Agit cherry-pick main
   • Bgit rebase main
   • Cgit merge main
   • Dgit pull main
   Reveal Solution Discussion Select an answer first
6. 5foundation · easy

   During a `git merge`, Git reports a conflict in `config.py`. After manually editing the file to resolve the conflict, which sequence of commands completes the merge?

   • Agit merge --continue
   • Bgit add config.py && git commit -m "Resolve conflict"
   • Cgit commit -m "Resolve conflict"
   • Dgit checkout -- config.py && git commit -m "Resolve conflict"
   Reveal Solution Discussion Select an answer first