Wiki
Clone wikiExperimentTool / D1 Working with Forks
Updating your fork with the latest changes in Repo
If you have a fork that has been around for a while, you will want to pull changes from the source repository before you send a pull request. That way, when a project coordinator accepts your pull request, it will be easier for them to merge the changes in. This is a fairly simple process, if you use the command line, here are the steps.
- Make sure your local clone of the fork does not have any uncommitted changes
- From your local clone of the fork, run "hg pull https://bitbucket.org/kit-iism/experimenttool"
- Assuming there were changes, you will need to merge your work in, so run "hg merge"
- Once you have resolved any conflicts, run "hg commit -m “<your commit message>”"
- Now you can push your changes back to your fork using "hg push"
If you would rather use Tortoise Hg just follow these steps:
- Make sure your local clone of the fork does not have any uncommitted changes
- On your local clone of the fork, right click -> TortoiseHg -> Syncronize
- Select https in the dropdown and enter the url for the source repo of the project (not the fork) eg: https://bitbucket.org/kit-iism/experimenttool
- Click the icon for “Pull incoming changesets from the remote repository”
- If any changes were pulled in, you will have to merge them, right click on your repository -> Hg Workbench
- Right click on the latest change -> Merge, then in the window that pops up click merge
- Once you resolve any conflicts, select your working directory in the graph view, enter a commit message and then click commit
- Finally, push your changes by clicking “Push outgoing change to default push target” Now you have all the latest changes, and you are ready to send a pull request.
Updated