Synchronizing Your Local Clone with the Upstream Repository
While working on your fork, other team members will contribute changes to the blessed repository, unless you are a solo developer. Long diverging histories have a higher probability to lead to merge conflicts, thus we recommend pulling in the changes from the blessed repository time to time.
Synchronizing with the Upstream using Git
To make your life easier, set up a so-called remote
pointing to the upstream repository. You have to do this only once, issuing the following commands in the root directory of the local clone of your fork.
pointing to the upstream repository. You have to do this only once, issuing the following commands in the root directory of the local clone of your fork.git remote add <name-of-the-remote> <clone-url-of-the-upstream-repository>
If you are not sure whether you have already set up the remote, you can easily list the existing remotes:
git remote
When you have the remote in place, you can pull in all changes from the upstream repo executing this any time:
git pull <name-of-the-remote> master
After executing this pull command, your local developer private is in sync with blessed again.
Synchronizing with the Upstream using Mercurial
It is recommended to setup a symbolic name to point to the upstream repository. This is a one-time operation that can be done by editing the
Launch the editor :
vim /path/to/your/local/clone/.hg/hgrc
Append a line to the paths section with the symbolic name like:
[paths]
default = ssh://bond@myserver.com/hg/hgtest-james
hgtest-blessed = ssh://bond@myserver.com/hg/hgtest-blessed
default = ssh://bond@myserver.com/hg/hgtest-james
hgtest-blessed = ssh://bond@myserver.com/hg/hgtest-blessed
If you want to check if this new name is picked up correctly by Mercurial, or you don't know whether you already created the symbolic name before, you can list the already configured paths any time by:
hg paths
If you registered the symbolic name, it is easier to pull in changes as you can enter the symbolic name instead of the URL of the repository:
hg pull -u hgtest-blessed
After this your clone is synchronized with the blessed repository.