If you're not careful, though, you can end up with problems like commits and changes ... the diverging histories: git checkout -b tempfeature git checkout feature git merge tempfeature You can ...