Right on! You can also use git rebase <branchname> to change the base of the current branch to be <branchname>.

Practice Quiz: Solving Conflicts » Week 3 » Introduction To Git And GitHub

Q: 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?

Nice job! The git pull command runs git fetch with the given parameters, then calls git merge to merge the retrieved branch heads into the current branch.

Q: Which of the following is a reason to use rebase instead of merging?

Way to go! git rebase is useful for maintaining a clean, linear commit history.

Q: Where should we keep the latest stable version of the project?

Great work! It's common practice to keep the latest version in the master branch and the latest stable version in a separate branch.

Q: Which of the following statements represent best practices for collaboration? (check all that apply)

Awesome! That way, whenever you start changing code, you know that you're starting from the most recent version, and you minimize the chances of conflicts or the need for rebasing.