Test fixes to reflect namespace related changes

smooks / unedifact

Smooks UN/EDIFACT Artifact Generation Sources

http://www.smooks.org

36 stars 37 forks source link

Test fixes to reflect namespace related changes #2

Closed tfennelly closed 13 years ago

zubairov commented 13 years ago

Hi Tom

Can't merge this one:

renat-zubairovs-macbook:upstream_smooks zubairov$ git pull https://github.com/tfennelly/smooks-unedifact.git MILYN-573 From https://github.com/tfennelly/smooks-unedifact

branch MILYN-573 -> FETCH_HEAD Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging pom.xml CONFLICT (add/add): Merge conflict in pom.xml Automatic merge failed; fix conflicts and then commit the result.

tfennelly commented 13 years ago

OK... thanks Renat... I'll have a look... sorry about that !!

zubairov commented 13 years ago

I suggest we squash commits when they are merged in the master trunk and not before, with that we could actually correct pull requests with new changes after comments made in the pull requests are fixed. Plus point -> person that made comment can only see difference between reviewed and changed after comments version.

tfennelly commented 13 years ago

Hey Renat. I merged without any conflicts or merge commits. Perhaps your local repo was not up to date?

zubairov commented 13 years ago

Hm... yup, can be. Great that you made it.