Question 316:
Multiple developers are working on a project in your organization. Team members publish, share, review, and iterate on code changes through Git branches and share with others. You designed a Git branching strategy to share and manage code. You are using feature branches for all bug fixes or new features and merging feature branches into the master branch using pull requests. One of the developers has made three changes to his feature branch. You want to make sure the below. 1. The changes work with the most recent version of the master branch. 2. You avoid any extra commits and ensure that the commit history is straight and linear. 3. Each commit should stand on its own. Which integration strategy will you opt for?
Answer options:
A.Squash B.Merge. C.Cherry-pick. D.Rebase.