search

swcarpentry / python-novice-gapminder

Plotting and Programming in Python
http://swcarpentry.github.io/python-novice-gapminder/
Other
163 stars 427 forks source link

Merge changes to gh-pages and edit Episode 02 #549

Closed vinisalazar closed 3 years ago

vinisalazar commented 3 years ago

This is an attempt at starting to work on the narrative branch (see discussion on #463).

If merged, this PR will:

For future PRs to this branch, is it okay to bring the latest changes from gh-pages every time, or should I avoid this?

Thank you for any assistance you can provide,

Vini

alee commented 3 years ago

no, we should not be merging gh-pages back into this narrative branch - it will make for a very confused commit history. If it's not too much trouble please resubmit with just your episode changes in the narrative branch. If you want to work off the latest gh-pages we can fast forward narrative to match gh-pages before you begin your work..

edit

Actually I just noticed that this looks like a clean fast forward of the changes in gh-pages, sorry for the confusion! So I think this should probably be fine, though in the future it's probably best to submit two separate PRs, one to sync narrative and the other with just the content changes you're adding

vinisalazar commented 3 years ago

Sure, that makes sense. Thank you @alee !

alee commented 3 years ago

just a heads up, this caused divergent history in the narrative branch so I rehomed your pull request against an up to date narrative branch (#550).

In the future I don't think we should worry about merging gh-pages back into narrative, just focus on the changes you'd like to make and we'll deal with any merge conflicts in the final PRs from narrative to gh-pages.

Thanks!