> >>I am an instructor for a workshop that for various reasons got pushed to > >>2016. Now I am left with what is an outdated workshop webpage. I'd like to > >>update it, but I don't quite know how to do that short of effectively > >>setting up the workshop webpages all over again. > > > >Why don't keep the GitHub repository and just push the changes on the dates, > >... > > My issue is that for instance, my workshop instructions are pointing to > python2, while the current lesson is pointing to version 3. I.e. I would > like to have a way of lifting over what is in the current workshop-template > onto my workshop webpage (hopefully without copy-pasting, because that > rarely works well).
We need a copy of your repo:
$ git clone [email protected]:karinlag/2016-02-04-ORNL.git
You can use the copy that you already have at your computer without problem.
Change the working directory to that copy:
$ cd 2016-02-04-ORNL
Add the template repository as upstream:
$ git remote add upstream [email protected]:swcarpentry/workshop-template.git
Fetch the data:
$ git fetch upstream
And merge the new changes (the change to Python 3, ...)
$ git merge upstream/gh-pages
You will got a few conflicts that should be easy to fix.
For example, you need to merge the YAML header.
After resolve the conflict,
$ git commit
or
$ git commit -m 'Get changes from upstream: Python 3'
The last thing is push the changes to GitHub:
$ git push origin gh-pages
Let me know if you something didn't work.
Cheers,
Raniere
signature.asc
Description: PGP signature
_______________________________________________ Discuss mailing list [email protected] http://lists.software-carpentry.org/mailman/listinfo/discuss_lists.software-carpentry.org
