Issue #542 FIX Pull Request

[mathieu-lavigne]

542: Pull Request

[oasp-ci]

Can one of the admins verify this patch?

[jomora]

@mathieu-lavigne thanks for your contribution. The changes in AbstractGenericDao look fine :-)

However, I have some suggestions:

1. You're asking to merge changes from the master branch of your fork into branch oasp:develop. The code contribution guide states the following:

If you completed your feature (bugfix, improvement, etc.) use a pull request to give it back to the community. One who is working on a feature, has to create a branch under the corresponding develop branch that is in place for that release . For eg., if develop-2.3.0 is the develop for that particular release , one has to create new branch (for eg., feature) under develop-2.30 in their forked repository and finally a Pull Request is created on the branch feature .

In effect, this means the following for creation of a pull request:

• Checkout the develop branch according to the upcoming release: develop-2.3.0 in this case. Why is this necessary? Only the develop-x.y.z branch contains the actual version of the code. develop and develop-x.y.z are only merged when the next version is released.
• After you have checked out develop-2.3.0 you have to create a new branch for you fix, e.g. git checkout -b myBranchName. This will create a new branch called myBranchName and directly check it out. Implement your bugfix in this newly created branch.
• Double check that you only commit necessary changes, e.g. changes to the pom.xml were not part of your fix and forced you to revert code and introduce unnecessary merge commits.
• Commit your changes locally using the following pattern for commit messages: #<issueId>: <describe your change>. Please, be aware that you had a commit in place where the commit message was written in French. Please stick to English ;-)
• Push your changes to your fork using: git push. Git will ask you to set the according upstream branch. Then your changes are available globally in your fork.
• Finally, create the pull request from you branch myBranchName into the according develop-x.y.z branch.

Please, follow this process to provide your changes in a new pull request. This serves two purposes:

1. Most important: you get to know the process and you become able to provide more PRs in the future ;-)
2. The commit history of the project stays clean.

So, if you have any question regarding this process, please don't hesitate to ask for guidance :-)

Thanks again for your contribution!

Cheers, Jonas

[Devonfw-ci]

Can one of the admins verify this patch?

[kiran-vadla]

@jomora , as discussed this merge has to be rolled back since the PR was created on develop branch and merged into it.

Thanks, Kiran.