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

Disambiguate provider vs package: Package Control #898

Merged
merged 1 commit into from
Mar 27, 2017

Conversation

franciscolourenco
Copy link

Spent some time trying to figure out how this was supposed to work :P

Spent some time trying to figure out how this was supposed to work :P
@paulmelnikow paulmelnikow merged commit 9b24ef7 into badges:master Mar 27, 2017
@paulmelnikow
Copy link
Member

Thanks for this clarification.

@franciscolourenco franciscolourenco deleted the patch-1 branch March 27, 2017 20:55
paulmelnikow added a commit that referenced this pull request Apr 7, 2017
Correctly apply changes from #898, and update build of index.html.
espadrine pushed a commit that referenced this pull request Apr 25, 2017
- Build index.html at deploy time
- Update corresponding documentation references
- Since index.html is untracked, git add needs -f
- Clarify gh-pages generated commit message
- Improve Makefile dependencies related to website generation

As discussed in #936, tracking the index.html causes makes PRs longer / noisier
and causes extra merge conflicts. More importantly, it causes contributors to
inadvertently edit the wrong file, which causes extra work (#949) or
contributions to be lost (#898).

Since there's no need for index.html in development (everything uses try.html) a
logical solution is to generate and commit the index.html at deploy time.

Recording compiled or generated files in a deploy commit is a reasonable
practice for git-based deploys (Heroku, gh-pages, and others).

The old version of this was slightly "unsafe" for my taste, in that it depended
on the local copy of gh-pages (if it existed) and master. The new version just
replaces gh-pages with master + the new commit.

Closes #936.

Fixes #954 (the PR).
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.

2 participants