-
Notifications
You must be signed in to change notification settings - Fork 519
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Restws 741: Removing 1.8 submodule completed successfully #584
Conversation
Basing on the changes introduced in this pull request. They are many, so you would split this ticket into sub tasks to help the reviewer quickly understand new changes introduced. |
oh okay thank you |
You can first handle this section you described here as transfering all code from class files from 1.8 to 1.9 make all changes neccessary and push a sub task PR. |
@josephbate with the merge conflicts? |
hello @dkayiwa |
Hello @josephbate . the ticket has merge conflicts, in otherwords, its not up to date with latest master, so you have to first git-pull to update your local branch, then resolve any conflicts and push again. |
thank you @sherrif10 let me see i can do |
Description of what I changed
Issue I worked on
see https://issues.openmrs.org/browse/RESTWS-741
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amend
I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amend
I ran
mvn clean package
right before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master