search

Freeseer / freeseer

Designed for capturing presentations at conferences. Pre-fill a list of talks to record, record them, and upload them to YouTube with our YouTube Uploader.
http://freeseer.readthedocs.org
GNU General Public License v3.0
216 stars 110 forks source link

Add sphinx_rtd_theme subtree #624

Closed dideler closed 9 years ago

dideler commented 9 years ago

Prerequisite for #621

Allows us to easily make custom changes to the theme without RTD overwriting them (e.g. footer, logo, colours, etc.) The remote is at Freeseer/sphinx_rtd_theme.

dideler commented 9 years ago

Whoa, where did all that come from?

dideler commented 9 years ago

FYI, GitHub Support gave an explanation for the confusing activity that suddenly appeared when the PR was merged.

Thanks for reporting this.

All the activity and participants weren't there before. It's a bit scary, especially since this is the first time I've used a subtree. Is GitHub supposed to show all of that or did I do something wrong?

It's not your fault. It's that we allow merging disjoint branches, that's causing the problem. I am sorry about that. We'll probably stop allowing that, but I don't have anything concrete to share right now.

The problem is that the subtree add --squash command, pulls in the content from the second project as a single, orphan commit. That commit has no common history with master, but github.com allows merging that branch with master, which causes the chaos.