Practice Quiz: Solving Conflicts Post author:Devendra Kumar Post published: Post comments:0 Comments 10. If you’re making changes to a local branch while another user has also made changes to the remote branch, which command will trigger a merge? Answers git pushgit pullgit rebasegit fetch 11. Which of the following is a reason to use rebase instead of merging? Answers When you want to keep a linear commit historyWhen you want a set of commits to be clearly grouped together in historyWhen you are on a public branchWhen pushing commits to a remote branch 12. Where should we keep the latest stable version of the project? Answers The master branchA separate branch from the master branchThe debug branchA remote branch 13. Which of the following statements represent best practices for collaboration? (check all that apply) Answers When working on a big change, it makes sense to have a separate feature branch.You should always rebase changes that have been pushed to remote repos.Always synchronize your branches before starting any work on your own.Avoid having very large changes that modify a lot of different things. 14. What command would we use to change the base of the current branch? Answers git checkout <branchname>git pullgit rebase <branchname>git fetch Previous Please Share This Share this content Opens in a new window Opens in a new window Opens in a new window Opens in a new window Opens in a new window Opens in a new window Opens in a new window Opens in a new window Opens in a new window Opens in a new window Opens in a new window Devendra Kumar Project Management Apprentice at Google You Might Also Like Project Closeout Activities Week 4 – Engage customers with an online store – Shuffle Q/A 1 Leave a Reply Cancel replyCommentEnter your name or username to comment Enter your email address to comment Enter your website URL (optional) Save my name, email, and website in this browser for the next time I comment.