- Add Increment as PR:
Level-6 - Add Increments as parallel branches:
Level-7,A-JavaDoc - Add Increment:
A-Jar
1 Add Increment as PR: Level-6
- Create a new branch
branch-Level-6. - Implement the increment in the new branch.
- Push the branch to your fork.
- Create a PR in your fork, from the new branch to the
masterbranch. Steps for creating a PR is given in this textbook topic (steps 5 onwards):
- Merge the PR using GitHub. Note how to merge PRs:
- Pull the
masterbranch from the fork to your local repo.
2 Add Increments as parallel branches: Level-7, A-JavaDoc
- Do Level 7 in a branch named
branch-Level-7. Without merging that branch, go back to themasterbranch and implement the other increment in a separate branch named similar to the first (i.e.,branch-{increment ID}). Now, go back to themasterbranch and merge the two branches one after the other. As before, tag the commit (in themasterbranch, after merging) that achieves the respective deliverable, and push to your fork.
Remember to push the branches to your fork so that the grading script can detect them.
Only merged branches are detected by the script. After merging a branchb1to themasterbranch, you need to push both themasterand theb1branches to the fork. Pushing themasterbranch does not automatically take theb1branch along with it just because it is already merged to themasterbranch.
Advanced git users: do not delete the branch after merging.
Merge without a fast-forward so that git creates a separate commit for the merge.
3 Add Increment: A-Jar
- In case this increment does not require any code changes, you may tag the commit at which this was achieved as
A-Jar(even if that commit has another tag already). - Upload the jar file to your fork as explained in the panel below.