The first is by making a new branch, and then merging the diverging histories: git checkout -b tempfeature git checkout feature git merge tempfeature You can also use git stash to store changes ...

Where Git fits in your distributed version control system tool belt Follow these Git commit message guidelines Where system, global and local Windows Git config files are saved How Atomist's Rod ...