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

Judygichoya #23

Closed
wants to merge 8 commits into from
Closed

Judygichoya #23

wants to merge 8 commits into from

Conversation

judywawira
Copy link

ticket 27 and 28 with patient identifier type fixed

@surangak
Copy link
Member

surangak commented Aug 2, 2012

This pull request is based on a lot of discussion + imporovements. I'm happy with it, and would like to merge it.
Two things prevent me from doing so-

  1. I wonder why I cant automatically merge this (has something gone wrong? What does Ben think ? )
  1. The liquibase changeset is missing the <CX.5>${ patientIdentifier.getIdentifierType()}</CX.5> segment. This is a minor fix, and we could do during the merge action itself

@surangak
Copy link
Member

surangak commented Aug 2, 2012

Hi Judy,

The good news is that we see only one tiny problem with this patch. The bad news is, we're having some trouble merging it to our github repo.
The problem is that your changes are on a file which were edited by another user before you committed yours, meaning that your files are out of date.

So, um... could you do the following -

  1. Pull down the latest changes from the repo
  2. Add your changes
  3. In the liquibase change set, please add the missing ${ patientIdentifier.getIdentifierType()} segment as well.
  4. make a pull request to us.

I'm really sorry for any inconvenience caused ...

@judywawira judywawira closed this Aug 2, 2012
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