...
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 main-JDK8 branch main 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.
...
To update your fork's copy of the main -JDK8 branch, check out your main -JDK8 branch on your clone and pull changes from the main -JDK8 branch from the team repository, aliased to "upstream." Then, push the changes to your fork.
...
| Code Block |
|---|
git checkout main-JDK8 git pull upstream main-JDK8 git push origin main-JDK8 |
If all goes well, your fork will then receive all the commits present on the main -JDK8 branch 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.
...
After updating your clone and fork with the latest changes to the main -JDK8 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 main -JDK8 branchbranch.
To rebase your branch on the latest main-JDK8, switch back to the main -JDK8 branchbranch, update it with any new commits, check out your feature branch, and rebase.
...
| Code Block |
|---|
git checkout main-JDK8 git pull origin main-JDK8 # assumes your fork is up-to-date git checkout IGBF-1234 git rebase main-JDK8 |
Next, push your newly rebased branch to "origin" (your fork) to update it:
...
- 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 main-JDK8 branch main branch as the pull request target (right side)
- Click Create pull request
...
- 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 main-JDK8 branch main 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.
...