New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump up the versions of Jekyll and other dependencies #55

Merged
merged 2 commits into from May 11, 2014

Conversation

Projects
None yet
3 participants
@yihangho
Copy link
Contributor

yihangho commented May 8, 2014

Also, the pygments option is renamed to highligher in Jekyll 2.

mmistakes added a commit that referenced this pull request May 11, 2014

Merge pull request #55 from yihangho/master
Bump up the versions of Jekyll and other dependencies

@mmistakes mmistakes merged commit 239f08a into mmistakes:master May 11, 2014

@ryan-p-randall

This comment has been minimized.

Copy link

ryan-p-randall commented May 12, 2014

What's the best way to go about upgrading previously installed versions? Fork the new one, then cut and paste in whatever we've changed to the relevant files?

@yihangho

This comment has been minimized.

Copy link
Contributor

yihangho commented May 12, 2014

I'm not sure if this is the best way, but this is what I will do (assuming I am starting a new site).

  1. Fork this repo.
  2. Make changes, customize and add posts, pages, etc.
  3. This repo is modified.
  4. Fetch the newer commits from this repo to your forked repo. Refer to this.
  5. Merge the newly fetched commits into your master branch, resolve conflicts along the way.
  6. Repeat 4-5 when you feel like upgrading.

Perhaps you can open a new issue to ask for advice? Love to know how others handle updates too.

@mmistakes

This comment has been minimized.

Copy link
Owner

mmistakes commented May 12, 2014

@ryan-p-randall I would upgrade exactly how @yihangho suggested. If for some reason you didn't fork the original repo you can follow these steps to do the same thing. You could of course just go through the commit history and copy/paste the changes depending on how minor they are, but pulling them in via Git and resolving conflicts is probably a better strategy.

  1. Create a new branch from master git checkout -b new-branch master
  2. Pull in commits from the Minimal Mistakes theme repo git pull https://github.com/mmistakes/minimal-mistakes.git
  3. Resolve any conflicts and commit.
  4. You'll probably have to remove the sample posts again because Git will most likely pull them in from the MM repo.

Hope this helps.

@ryan-p-randall

This comment has been minimized.

Copy link

ryan-p-randall commented May 14, 2014

@yihangho & @mmistakes Thank you two so much for the clarification!

iconpin pushed a commit to iconpin/iconpin.github.io that referenced this pull request Mar 22, 2016

Merge pull request mmistakes#55 from jylitalo/sort-pages-in-sidebar
sort pages in sidebar into logical order (alphabetically by url)

cjmadsen pushed a commit to cjmadsen/cjmadsen.github.io that referenced this pull request Dec 7, 2016

jluccisano added a commit to jluccisano/jluccisano.github.io that referenced this pull request May 6, 2017

Merge pull request mmistakes#55 from yihangho/master
Bump up the versions of Jekyll and other dependencies

antonizoon pushed a commit to antonizoon/antonizoon.github.io that referenced this pull request Jul 27, 2018

Merge pull request mmistakes#55 from yihangho/master
Bump up the versions of Jekyll and other dependencies

Manu343726 pushed a commit to Manu343726/Manu343726.github.io that referenced this pull request Sep 17, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment