Prefixfree as git submodule #22

Merged
merged 2 commits into from Jan 25, 2012

Conversation

Projects
None yet
3 participants
Contributor

jorgecasar commented Jan 23, 2012

I follow this steps with the Lea's private URL as a remote repository.
http://help.github.com/submodules/

Prefixfree as git submodule
I follow this steps with the Lea's  private URL as a remote repository.
http://help.github.com/submodules/
Owner

LeaVerou commented Jan 23, 2012

Niceee, thanks!

As a submodules n00b, I have a few questions:

  • What will happen when I commit to prefixfree?
  • What will happen after I merge this pull request and pull to my local repo?
Owner

LeaVerou commented Jan 23, 2012

Oh, btw, prefixfree isn't a plugin, it's absolutely needed for CSSS, as it's used by its stylesheets too. So, it should probably be on a separate folder (/prefixfree instead of /plugins/prefixfree)

Contributor

jorgecasar commented Jan 23, 2012

In theory is like a soft link, then it's like the original one. You can change in prefixfree repository and the changes will update in CSSS. And if you change in CSS/prefixfree, you can push directly from here because I mark as remote repository prefixfree repository with your's private URL.

I'll change the path and pull again. If you want to try clone my fork (https://github.com/jorgecasar/CSSS).

LeaVerou added a commit that referenced this pull request Jan 25, 2012

Merge pull request #22 from jorgecasar/master
Prefixfree as git submodule

@LeaVerou LeaVerou merged commit 27df054 into LeaVerou:master Jan 25, 2012

Owner

LeaVerou commented Jan 25, 2012

Merged. Lets see how it goes. Thanks!

It's not on gh-pages yet though, as I have to do that locally and then push, so it will take a while. I wish I could do that through github's web interface.

Contributor

jorgecasar commented Jan 25, 2012

You are welcome!

To do that you have to follow the same steps in the gh-pages brach, don't you? I'm trying to find how keep sync both branches. If I get it I'll tell you.

Owner

LeaVerou commented Jan 25, 2012

I have to pull it locally, rebase the gh-pages branch to make it the same as master and then push to gh-pages. I know how to do it, but it's tedious so I'll probably just do it next time I work on CSSS myself.

Good luck finding a way to keep them in sync automatically. I've looked A LOT but couldn't find anything that doesn't involve any manual intervention. The best way so far seems this: http://oli.jp/2011/github-pages-workflow/ which suggests only having a gh-pages branch, but I'm not feeling very comfortable with not having a master branch at all. I wish github allowed people to specify the master branch to be used by Github Pages. :(

Munter commented Jan 25, 2012

If you make prefixfree an npm module and link it locally you can work on your live prefixfree updates inside CSSS.
That would require people using CSSS to install npm of course. It's a rather nice workflow to publish things on npm and depend on them though

mparker17 pushed a commit to mparker17/csss-drupal-intro that referenced this pull request Feb 13, 2013

Merge pull request #22 from jorgecasar/master
Prefixfree as git submodule
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment