Git: Merging from Remote Branch « Ruby on Rails Outsourcing - 0 views
-
if the changes don't conflict, you're done. Alternatively, you can pick out individual commits from "repo1/stable" to your current branch by using git cherry-pick refnumber