To develop IGB, we use the Forking Workflow described in https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow, but with one difference - we issue pull requests to the development branch, not the master branch.
The following sections describe how to use this workflow to develop IGB.
To contribute a change to the IGB code base, create your own fork of the IGB repository.
To create your own fork:
Next, you'll see a form that let's you give your fork a name and description. Here's an example:
Fill in the fields and click Fork repository.
After a moment, the Overview page for your forked repository will appear.
See Atlassian documentation Forking a Repository.
Clone a copy of your forked IGB repository onto your computer. You will make changes to your local clone, commit them to your local repository, and then ultimately push your changes to your fork hosted on Bitbucket.
To clone your fork:
git clone <ADDRESS> |
where ADDRESS is the address of your fork on Bitbucket. To get the address of your fork, look at the top the top right of your fork's Overview page on Bitbucket.
Before you start making changes to your local clone, you should first create a new branch for the changes you intend to make. This will allow you to issue focused, low risk pull requests that can be easily merged with other branches of development.
To make a branch:
git checkout igb_8_3 |
git branch -b BRANCH |
where BRANCH is the name of the branch, e.g., IGBF-203, the name of a story in the IGB JIRA issue-tracking system.
Edit your code, test it locally, commit your changes to your local copy, and then push them to your fork hosted on Bitbucket. For example:
git commit -m "Correcting a typo - joe instead of jeo" |
git push origin BRANCH |
To request that your edits be incorporated into the main line of development:
A pull request form will appear. Fill in the fields:
If the main development branch changes, you should merge in those changes to your fork. Bitbucket has utilities that make this easy - see https://blog.bitbucket.org/2013/02/04/syncing-and-merging-come-to-bitbucket/.
To bring a remote fork up-to-date with a development branch:
git remote add upstream git@bitbucket.org:lorainelab/integrated-genome-browser.git |
Fetch and merge changes from upstream for a development branch (e.g., igb_8_5) using pull or rebase commands
git pull upstream DEVBRANCH |
or
git pull --rebase upstream DEVBRANCH |
git push origin DEVBRANCH |
IGB makes heavy use of graphical user interface components in the GenoViz Software Development Kit. Normally, when you build IGB (using maven - see ), you'll use a copy of the GenoViz SDK downloaded from our maven repository at http://eos.transvar.org/nexus/. However, if you clone and build your own copy, your version will automatically get added to your local maven repository.