Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Update keyboard key references with Carpentries style #342
I don't think I did it right. I can't compare to the master branch (as requested by the contributing instructions), and I only changed this one file - yet it's saying I want to merge 5 commits (4 of which were from 2 years ago from another person).
and this fix was merged an hour ago by someone else (since mine didn't work I guess). Can someone close this now? This is the second issue that i've tried to fix that has already been addressed. Is there some guidance for contributors to at least state that they're working on an issue so others don't waste time trying to fix something that someone else has already done?
@norcalbiostat Thank you for your PR! I'm very sorry it got confusing (and I definitely agree git is pretty far from intuitive!). One of the things we are working on this quarter is a more Carpentry-oriented guide for making contributions, in addition to the general guides out there on the Internet.
I think the issue causing the merge conflicts is that you had forked the lesson a while back, and the version you made changes to was an old one instead of the newest, which is why you saw all the merge conflicts. The other possibility is that you made changes to master or some other branch instead of gh-pages.
To get the newest changes from this repo, there are two options (and forgive me if you know all of this already, but just in case I'll talk it out):
# This adds the address to the main SWC repo of the lessons git remote add upstream https://github.com/swcarpentry/r-novice-gapminder.git # this checks out the gh-pages branch locally on your machine so changes we pull down # get added to it (instead of, e.g., the master branch) git checkout gh-pages # this pull down all the new changes from the SWC repo and merges them on top of your # local changes git pull upstream gh-pages # this pushes all the updated content back to your fork of the repo, which is # under your account on GitHub git push origin gh-pages
Now you have all of the newest changes both locally and on your fork.
Here's a visual:
Or, 2) delete your fork on GitHub and then re-fork it, so you have a copy of all the newest changes. Then make your change as usual and open a PR.
Then any time you want to make a new contribution to the repo, just repeat steps 3-6 in the diagram.
Also, I think the documentation is out-of-date, since we just use the gh-pages branch directly now, and don't ever use the master branch. So thank you for pointing that out, we'll need to get that fixed ASAP.
I was also in the middle of fixing the merge conflicts on your PR locally so that your contribution could be merged and your contribution recognized, and was also surprised to see the other PR with a fix to the same issue submitted and merged before yours.
That's a coordination issue that we (cc: @jcoliver @mawds) as maintainers of this repository need to get figured out (it's just been me for a while, and two new maintainers just started yesterday), and not the way things should work around here.
Once again, I'm sorry for the confusion and frustration, and I hope it doesn't discourage you from making future contributions! We're also always happy to help troubleshoot the contribution submission process anytime in an issue or a PR -- just tag one or all of us and we can take a look and help get things on track.