To develop IGB and the IGB API, the core IGB development team uses the Fork-and-Branch Workflow described in https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow
Quick Summary: Developers fork the team repository on Bitbucket. When working on a bug fix or new feature, they create a topic branch specific to that task. They push their branch to their fork for review and testing. When all is done, they submit a pull request from the topic branch on their fork to the master branch on the team repository. When working on a task recorded in the IGB JIRA system, they include the corresponding JIRA number (e.g., IGBF-1234) in the branch name and every commit to that branch.
- Step-by-Step Set-up Guide
- Synchronize early & often with the main repository
- Rebase your branch
- Make a pull request - PR
- Learning git
Step-by-Step Set-up Guide
Fork the code on Bitbucket - configure your fork
- Sign up for a free account on Bitbucket. Use an "edu" address if you have one to get more "build minutes" with Bitbucket pipelines.
- Set up ssh for git to avoid having to enter your password every time you interact with Bitbucket using git. See: Set up SSH for Git.
- Using your Bitbucket account, fork the team repository: https://bitbucket.org/lorainelab/integrated-genome-browser
- Configure your fork to link to team project management software JIRA.
- Log into Bitbucket
- Go to your fork home page
- Select "Settings > Links > Add new link"
- Choose Link type "Jira"
- Enter Link url https://jira.transvar.org/
- Enter Link key IGBF
- Check that the links work - select "Commits"
- Look for commit messages containing the Link key "IGBF"
- Note that all link keys now link out to JIRA
Clone your fork and add the team repository as "upstream"
- Clone a copy of your forked IGB repository onto your computer using your favorite git client software.
- Add the team repository as a remote called "upstream" (the convention.)
Start work - make a branch
Before you start work on a new feature, bug fix, or other improvement, create a new branch for the changes you intend to make. This new branch is called a "topic branch" and should only address one specific, discrete feature or bug fix.
Important: If you are working on a task captured in the IGB JIRA project, include the JIRA issue number in the branch name. This enables the JIRA and Bitbucket sites to create links to each other.
where IGBF-1234 is the name of the new branch.
Edit code, commit to your clone, push to your fork
Edit your code, test it, commit your edits to your local copy, and then push them to your fork hosted on Bitbucket. If working on a JIRA issue, always include the JIRA ticket name in the commit.
Synchronize early & often with the main repository
If the main development branch changes, you must obtain those changes and test them with your branch.
First step is to update your fork's copy the master branch. The easiest way to do this is to use the Bitbucket interface.
To synchronize your fork using the Bitbucket interface:
- Log in to your Bitbucket account
- Go to your fork's home page
- Select "Repository Details"
- Look for the "Sync" button. Click it.
If all goes well, your fork will then receive all the commits present on the master branch on the team repository. To check that it worked, just review the commit history on your fork and compare it to the team repository.
Note: the Sync button appears only if your fork lacks commits present on the team repository's master branch. By default, Bitbucket shows you the master branch.
You can also update your fork's master branch from the command line. For that, check out your master branch on your clone and pull changes from the master branch from the team repository, aliased to "upstream." Then, push the changes to your fork.
Rebase your branch
After updating your clone and fork with the latest changes to the master branch, you'll need to test how those new commits interact with your topic branch. You should use "rebase" commands to do this. This will move the "base" of your topic branch to the latest commit on the master branch.
To rebase your branch on the latest master, switch back to the master branch, update it with any new commits, check out your feature branch, and rebase.
For example, let's assume you have committed all your work to your topic branch - called IGBF-1234 in this example. Then run:
Next, push your newly rebased branch to "origin" (your fork) to update it:
Make a pull request - PR
To request that your edits be incorporated into the team repository, you need to make a pull request (PR).
To make a PR using the Bitbucket UI:
- Log in to your Bitbucket account.
- Go to your fork and select "Branches"
- Under "Pull request" select "Create" next to your branch
- A form will appear. Fill in the fields:
- Select your fork and your branch as the pull request source (left side).
- Select the team repository (lorainelab) and master branch as the pull request target (right side)
- Click Create pull request
Things you need to know about PRs:
- If you make changes to your branch (the source of the PR), those changes will be reflected in the PR. You do not need to create a new PR if you add new commits or otherwise modify your branch.
- You should always rebase onto the latest master branch before submitting a PR.
- Please squash all your commits into one single commit, unless you have a very good reason not to. This ensures that we can easily apply your changes to other branches if required. It also makes code review easier.
- The project admins get email notifications whenever someone submits a PR. However, if you do not hear anything about your PR, get in touch.
The IGB team highly recommends working through the tutorials in Learning Git Branching - https://learngitbranching.js.org/?locale=en_US. Also, when you rebase for the first (or second or third) time, it's helpful to repeat the tutorial on rebasing. Don't worry. You will get the hang of it.