Skip to content
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

trunk-3987NEW(1.8.x) #572

Merged
merged 3 commits into from Jan 22, 2014
Merged

trunk-3987NEW(1.8.x) #572

merged 3 commits into from Jan 22, 2014

Conversation

suraj5
Copy link

@suraj5 suraj5 commented Jan 22, 2014

I have modified the changes asked by you.

I have modified the changes .
@dkayiwa
Copy link
Member

dkayiwa commented Jan 22, 2014

@suraj5 is this pull request to be used together with the previous one? or should we close one and take the other?

@suraj5
Copy link
Author

suraj5 commented Jan 22, 2014

@dkayiwa close the first one and take the second one:)

@dkayiwa
Copy link
Member

dkayiwa commented Jan 22, 2014

@suraj5 but the second does not have all your changes in the first one. :)

@suraj5
Copy link
Author

suraj5 commented Jan 22, 2014

@dkayiwa Now I made all the changes. :)

@dkayiwa
Copy link
Member

dkayiwa commented Jan 22, 2014

@suraj5 are using the openmrs formatter here https://wiki.openmrs.org/display/docs/Coding+Conventions#CodingConventions-CodeStyle?

Or did you do an "mvn clean install" before committing? It is supposed to correctly format your java files.

@suraj5
Copy link
Author

suraj5 commented Jan 22, 2014

@dkayiwa yes,I downloaded OpenMRS formatting file ,template file into my eclipse and I didnt do any an "mvn clean install" before making changes to "Trunk-3978NEW(1.8.x)

@dkayiwa
Copy link
Member

dkayiwa commented Jan 22, 2014

Can you do it now and then make another formatting commit?

@suraj5
Copy link
Author

suraj5 commented Jan 22, 2014

@dkayiwaI am new to OpenMRS . Let me be clear ,now I should do a mvn clean install on Trunk-3987NEW(1.8.x) and commit it or otherwise should i create a new branch and do a mvn clean install and commit on that.

@dkayiwa
Copy link
Member

dkayiwa commented Jan 22, 2014

@suraj5 after doing mvn clean install, commit to this same pull request for the same branch. This commit will only be a formatting one.

@suraj5
Copy link
Author

suraj5 commented Jan 22, 2014

@dkayiwa Thanks for the reply.I'll do it now.:)

dkayiwa added a commit that referenced this pull request Jan 22, 2014
@dkayiwa dkayiwa merged commit e8bdcd8 into openmrs:1.8.x Jan 22, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants