Conversation
…ich is configured in the maven.xml file
|
@Ahsanadam It seems that there are new changes in the main branch that are conflicting with this pull request. |
|
Maybe I need to fetch the new changes from the main branch and submit a pull request again. I accidently made the change on the main branch before I actually created a new branch to resolve this issue. That could be the problem. |
You don't need to submit a new pull request. If you update your branch and push the changes this pull request will be automatically updated. |
|
Okay |
|
<<<<<<< issue-38 // Delete this from the file |
|
I have already updated it and pushed it. To resolve the conflict, just delete the statements that I mentioned above |
|
Sill seem to have conflicts. Update the project locally, then merge main into your branch and then push it again. Should resolve the problem. |
|
Done |
DarkendHall
left a comment
There was a problem hiding this comment.
Seems to me that the if cases are incorrectly configured for our project.
LordRekishi
left a comment
There was a problem hiding this comment.
Looks good as far as I can tell. The answers to @DarkendHall questions were all resolved and that also answers my questions. Approved.
Added a new plug into the pom.xml and created a configuration to have a jacoco code coverage in github action on the maven.yml file. Followed the structure that is written on this website: https://github.com/marketplace/actions/jacoco-badge-generator.