Please rebase the branch onto the latest master branch.
Also, please try this:
Instead of using the Bitbucket "sync" button to bring your fork up-to-date with the team repository, use your local clone as a go-between to update your fork.
By avoiding the "sync" button, I think we can avoid seeing loads and loads of merge commits, which keeps the project history smaller and easier to read. I recently stopped using "sync" because of that.
In case this will be helpful, here are some instructions on how to do that. But there are many ways to do the same thing in git, so don't feel like you have to do it exactly this way if you prefer another approach.
- On your local copy of IGB, switch to the master branch (save any work you have not yet committed by using "git stash")
- If you have not already done so, add the team repository as a new remote, aliased to the string "upstream" (git remote add upstream https://bitbucket.org/lorainelab/integrated-genome-browser.git")
- Check that the above command has worked properly by listing your clone's remotes (git remote -v)
- Update your local master branch using upstream (git pull upstream master)
- Push the changes up to your fork, which is very likely "aliased" to the string "origin" (git push origin master)
Now your fork is up-to-date. Yay!
Next, rebase your branch on the master branch, which is now up-to-date in your clone and your fork. Resolve any conflicts that may come up.
A tip: Before rebasing, re-play a few of the "learn git branching" rebase animations as a warm-up if you need it.