I was originally working on a repository (say /path/to/d_orig
) and maintaining versions on it using Git. I wish to move into a newer version of the repository which has been updated by others and contains some major changes.
In order to keep my current version and the newer version separate, I have a cloned from the bare repository of the newer version at a different location (say /path/to/d_bare
). After cloning, how can I pull/merge the changes from d_orig
to d_bare
?