Rebase on Upstream? about jekyllthemes

[gynter]

I'm not sure if rebasing will do any good (except for the new themes), since this repo has features which upstream doesn't have (i.e stars, github metadata, and different thumbnail resolution). If I have a bit free time I'll try to make some useful modifications to upstream too (like removing the dates from front matter). I cannot make any major changes to upstream thou, since those are out of the scope from my agreement with Matt.

[gynter]

My idea is to get at least the _posts directory into sync with this fork and upstream which should make merging between those easier. But that would probably mean that we have to make changes in our stars and github metadata system, since I don't want to put unneeded (bloated) data to upstream.

[mushishi78]

Does rebasing do any harm though? Is there another way to merge in new themes without merging in the changes on the mattvh repo?

Otherwise, I'm just going to ignore new themes for the time being because I'm not going to do it manually.

[gynter]

I guess that it shouldn't do any harm so feel free to do that if it makes merging easier.