Skip to content

Can't preview in page for files in prior public dataset versions#6422

Merged
kcondon merged 3 commits intoIQSS:developfrom
QualitativeDataRepository:IQSS/6421
Dec 2, 2019
Merged

Can't preview in page for files in prior public dataset versions#6422
kcondon merged 3 commits intoIQSS:developfrom
QualitativeDataRepository:IQSS/6421

Conversation

@qqmyers
Copy link
Member

@qqmyers qqmyers commented Nov 26, 2019

New Contributors

Welcome! New contributors should at least glance at CONTRIBUTING.md, especially the section on pull requests where we encourage you to reach out to other developers before you start coding. Also, please note that we measure code coverage and prefer you write unit tests. Pull requests can still be reviewed without tests or completion of the checklist outlined below. Note that we use the "closes" syntax below to trigger Github's automation to close the corresponding issue once the pull request is merged.

Thanks for your contribution to Dataverse!

Related Issues

Pull Request Checklist

@coveralls
Copy link

coveralls commented Nov 26, 2019

Coverage Status

Coverage remained the same at 19.562% when pulling 37906d3 on QualitativeDataRepository:IQSS/6421 into dadf117 on IQSS:develop.

@scolapasta scolapasta removed their assignment Dec 2, 2019
@kcondon kcondon self-assigned this Dec 2, 2019
@kcondon
Copy link
Contributor

kcondon commented Dec 2, 2019

@qqmyers This is ready to merge but there is a merge conflict. Can you take a look?

@qqmyers
Copy link
Member Author

qqmyers commented Dec 2, 2019

@kcondon - I just accidentally resolved the conflict the wrong way, resulting in no changes to merge. I then went back to the branch in QDR and re-applied the change, but pushing that back to QDR doesn't appear to update this PR. I''m not sure why it isn't updating - are changes not allowed after approval?

In any case, let me know how you want to resolve this:
figure out why the latest commit on the QDR branch isn't getting to this PR,
somehow reverse the last change to resolve the conflict the other way, or
punt and just open a new PR with the correct change.

@qqmyers
Copy link
Member Author

qqmyers commented Dec 2, 2019

@kcondon - nevermind - dyslexia - I was trying to change 6241 instead of 6421. I've now committed the change to this branch and it should be good to go.

@kcondon kcondon merged commit af65f3a into IQSS:develop Dec 2, 2019
@kcondon
Copy link
Contributor

kcondon commented Dec 2, 2019

@qqmyers Thanks!

@djbrooke djbrooke added this to the 4.19 milestone Dec 3, 2019
@qqmyers qqmyers deleted the IQSS/6421 branch May 17, 2024 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Can't preview in page for files in prior public dataset versions

5 participants