First some terminology:¶
- Remote repository - A library or program which is published on mbed.org.
- Local repository - A library or program which is in your private workspace. A Local repository may be 'linked' to a Remote repository if it was imported or published.
- Pull - Copy changes from Remote repository to a Local repository in your workspace.
- Push - Copy changes from Local repository to a Remote one.
- Fork - Create Remote repository on mbed.org from imported Local repository (that may also contain local changes/modifications) under your profile.
- Publish - Publish changes to existing repository (push) or create new one (fork)
- Update - Pull from a Remote repository and switch your Local repository to the latest revision.
The most basic (and the most popular) usage of the collaboration system is the traditional workflow where one author develops a project, multiple users import and use it.
When you import a repository, you are making a clone of a public repository in your private workspace. An imported repository can either be a whole program or a library for a program and can contain dependencies to other repositories. For example, a library may need another library in order to work. All dependencies will be imported for you automatically when you import a repository.
Once imported the Local repository in your workspace will be 'linked' to the Remote repository by URL to let you check it's status, receive new changes and even contribute code to it.
To import a repository, simply click the Import link on the repository on the mbed website, or use the Import button within the mbed Compiler. You can read more about importing on the Importing code wiki page.
While browsing a program or a library, you will receive notification for new versions in the Browser panel under the Summary tab:
It is also possible to view detailed information about the new changes in the Revisions panel. The top list represents the Local repository revisions, where revision numbers marked in green are outgoing revisions, currently not present in the Remote repository (see this image). The bottom list represents the Remote repository revisions currently not present in your Local repository. Just like with local revisions, you can click on revisions in the remote list to see changesets and individual changes per file.
To get the latest version of the code, simply click the 'Update' button.
Forking a repository¶
When you add changes to an imported repository in your private workspace, you might want to publish them for others to use.
Unless you are the author of the imported repository or have developer access (see working with multiple authors), you would be forced to fork (or re-publish).
Open the context menu of the imported program or library and click the 'Publish' as shown below:
You will be prompted to publish to the linked Remote repository:
As you do not have permission to publish to the repository, click the "Fork..." button.
This will publish the repository in your profile on the mbed.org website, along with your changes.
The forking process is identical to the code publishing workflow/interface with the exception that the forked repository will be recognized as a fork of the original/imported one:
When you fork a repository, the Local repository in your workspace will be linked to the forked Remote repository - the URL changes to the forked repository URL. You can change the URL by clicking the pencil icon next to the URL in the Revisions panel.
Once the fork is complete you can send a Pull Request to the ancestor (imported) repository to pull from your fork. This is covered in the Pull Requests wiki page.
Updating from a fork¶
If someone forks one of your repositories and modifies it, you can easily pull in any changes they have made into your own workspace. First click the 'Update From ...' button as shown below:
Then, enter the URL of their published repository you want to pull changes from.
Once you click OK, all their changes will pulled into your Local repository.
This won't change the URL of your Local repository.
Comparing with a fork¶
The Revisions panel lets you compare Local repository with Remote one if they are 'related'. The term 'related repositories' means that either repository is ancestor to the other through direct or indirect relationship (e.g. fork of the fork of the fork).
To compare Local repository with Remote one, open the Revisions panel and click "Compare WIth ..." button located on the bottom panel like shown here:
Then, enter the URL of the Remote repository you want to compare with.
Comparing repositories doesn't apply any actions or changes to your Local repository, so you can safely review the remote revisions without affecting your local work.
Once you click OK in the dialog, both repositories relativity will be validated and if successful some UI elements in the Revisions panel will be changed to reflect the comparison mode:
You can view remote changes by clicking on revisions in the bottom (remote) panel and once happy with them you can pull individual revision through 'Pull this revision' context menu item or by simply dragging and dropping them in the upper (local) panel.
Alternatively you can pull all changes via the 'Pull All' button or pull and switch to the latest revision via the 'Update' button as you would normally do in non-comparison mode (see Getting updates).
Posting new comments for this page has been disabled