iP:
A-MoreOOP
Level-8
, Level-9
, A-JavaDoc
tP:
v1.0
)A-MoreOOP
Level-8
, Level-9
, A-JavaDoc
branch-Level-8
etc.), but do not merge any.master
branch). 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.When you are doing the next step, you can run into merge conflicts. In some cases, GitHub will give you a way to resolve those conflicts using the Web interface. While this approach may be good enough for simple merge conflicts, de-conflicting locally in the standard way is safer (e.g., you can run tests to confirm the updated code is correct) and more standard (it's a standard Git feature that you can use even when you are not using GitHub for your project).
Create merge commit
option when merging.master
branch of your local repo to fall behind that of your fork (). Therefore, you need to sync the local master
with the remote master
branch. One way to do that is to switch to the local master
branch and then pull the updated master
branch from your fork e.g.,$ git checkout master
$ git pull origin master
master
. To rectify, merge the master
branch on to each of them. Resolve merge conflicts, if any.java -version
command to confirm the terminal is using Java 17../gradlew clean shadowJar
command to create the JAR file.v0.2
) and upload the JAR file.
v1.0
)v1.0
).