Skip to content
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

adding 0.18.1 release announcement #9

Closed
wants to merge 1 commit into from

Conversation

heuermh
Copy link
Member

@heuermh heuermh commented Oct 29, 2015

Sorry, something looks not right about this pull request, maybe I'm not doing it against the right base?

@heuermh
Copy link
Member Author

heuermh commented Nov 2, 2015

Ping @massie @fnothaft

@fnothaft
Copy link
Member

fnothaft commented Nov 2, 2015

Your source branch is a hybrid of the source and master branches...? How did? What? ;)

If you're around, perhaps let's get on IRC and sort this out.

@heuermh
Copy link
Member Author

heuermh commented Nov 2, 2015

Yup, "What?" is about right. I'll jump on IRC in a sec.

@massie
Copy link
Member

massie commented Nov 2, 2015

Octopress creates a _deploy directory which is a git repo (pointing to the master branch). The master branch is the content that github serves. You should double-check that you have _deploy in your .gitignore and don't check anything in there (that is handled by the rake commands).

The _deploy directory is created when you run rake generate.

@massie
Copy link
Member

massie commented Nov 2, 2015

You are using the correct base -- changes should be to the source branch.

@massie
Copy link
Member

massie commented Nov 2, 2015

This looks good to me. Nice release announcement.

@heuermh
Copy link
Member Author

heuermh commented Nov 2, 2015

Thanks @massie, I had some trouble with git that @fnothaft helped clear up.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants