Merge and Rebase — Advanced Git and GitHub — Atlas