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

Moving . outside ) #26

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Moving . outside ) #26

wants to merge 3 commits into from

Conversation

djbrooke
Copy link
Contributor

quick test for @qqmyers and @pdurbin of the "Allow edits from maintainers" feature. It's checked.

@qqmyers
Copy link
Member

qqmyers commented Oct 23, 2019

The change I made, which hopefully is in @djbrooke 's repo, was by clicking the edit button in the github GUI and selecting to commit directly to the branch. Does it look like it worked as expected?

@pdurbin
Copy link
Member

pdurbin commented Oct 23, 2019

@qqmyers yes, as expected, if we look at @djbrooke 's fork at https://github.com/djbrooke/dataverse-previewers/commits/patch-1 we can see your commit there (above his since it's newer). Here's a screenshot:

Screen Shot 2019-10-23 at 4 02 11 PM

@qqmyers
Copy link
Member

qqmyers commented Oct 23, 2019

OK - and then one by cloning his repo and committing from my desktop using eclipse. (I did tell eclipse who I was at github so presumably it is sending my creds to allow me to upload to the djbrooke repo.

I think this is useful... Is this what didn't work with the QDR-IQSS Dataverse pulls?

@qqmyers
Copy link
Member

qqmyers commented Oct 23, 2019

One more note - if I go to the djbrooke fork and select a file in the patch-1 branch, the github pencil icon says 'edit this file' whereas if I select from the master branch, it says 'fork and edit', so I appear to only have access to this branch as I should.

@pdurbin
Copy link
Member

pdurbin commented Oct 23, 2019

What didn't work for me is what I wrote about at http://guides.dataverse.org/en/4.17/developers/version-control.html#adding-commits-to-a-pull-request-from-a-fork which boils down to the moral equivalent of what I wrote there:

git remote add OdumInstitute [email protected]:OdumInstitute/dataverse.git
git fetch OdumInstitute
git checkout 4709-postgresql_96
vim path/to/file.txt
git commit
git push OdumInstitute 4709-postgresql_96

To be clear, this is not a problem! When the above fails I just take it to mean that the contributor doesn't want anyone messing with their fork, which is a perfectly reasonable stance. In that case I just make a pull request into their pull request.

@qqmyers
Copy link
Member

qqmyers commented Oct 23, 2019

But I did leave the 'allow edits' option checked (should be true for all my PRs to Dataverse), so I'm confused as to why it doesn't work. (If that does work, then I'm confused about what the issue was on the last MDC PR)

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.

3 participants