Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

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 developmentdevelopers work.

To make a branch:

  • First, you will need to switch to the latest development branch. Then you will be able to create a new branch from this context. For example, if the development branch is igb_8_6, you would execute:
Code Block
languagebash
git checkout igb_8_6
  • Next, create a branch for the changes you plan to make:
Code Block
languagebash
git checkout -b BRANCH

...

  • Select your branch (see above) as the pull request source (left side).
  • Select the current development master branch as the pull request target (right side).
  • Fill in the Title and Description fields 
  • Click Create pull request

 

Synchronize with the main repository

...

If the main development branch changes, you should merge in those changes to into 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 your remote fork up-to-date with a development branch::

  • Add the original, main IGB repository as a remote git repo with the alias "upstream"

...

  • Fetch and merge changes from upstream for a development branch (e.g., igb_8_5) 's master branch using  pull or rebase commands

...

Code Block
git pull upstream DEVBRANCHmaster

or

Code Block
git pull --rebase upstream DEVBRANCHmaster

 

  • Push these changes back to your fork's master branch (aliased to "origin" in this example)

...

Code Block
git push origin DEVBRANCHmaster

 

GenoViz Software Development Kit

IGB makes heavy use of uses graphical user interface components in the GenoViz Software Development Kit.  Normally, when you build IGB, 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.

...