- Add Increment:
A-MoreOOP - Add Increments as PRs:
Level-8,Level-9,A-JUnit
1 Add Increment: A-MoreOOP
- As in the previous week, commit, tag, and push, as you do the following increments in the
masterbranch (no need to use separate branches).
2 Add Increments as PRs: Level-8, Level-9, A-JUnit
- Note how to merge PRs:
- Practice using parallel git branches and PRs, as explained below:
- First, do each increment as a parallel branch (follow the branch naming convention you followed earlier
branch-Level-8etc.), but do not merge any. - Then, push each branch to your fork, and create a PR within your fork (i.e., from the increment branch to the
masterbranch). Be careful not to create a PR to the upstream repo. If you did create such a PR by mistake, no worries, just close it yourself.
- Now, merge one of the PRs and update the remaining PRs accordingly, as given below:
- Merge one of the PRs on GitHub e.g., Level-8. Remember to choose the
Create merge commitoption when merging. - Pull the updated
masterbranch from your fork to your Computer. - Note how the remaining un-merged branches are no longer in sync with the latest
master. To rectify, merge themasterbranch to each of them. Resolve merge conflicts, if any. - Push the updated branches to your fork. The PRs will update automatically to reflect the updated branch.
- As before, tag the merge commit in the master branch and push the tag to your fork.
- Merge one of the PRs on GitHub e.g., Level-8. Remember to choose the
- Merge the remaining PRs using a procedure similar to the above.