Beg. Level: Send Radiant CMS w/extensions to Heroku
Hey,
I made the page I wanted locally with Radiant CMS and several extensions. Then when I went to send it to Heroku I ran into a variety of errors, first SSH, then I think I sent over the gems but not the extensions. And in attempting to fix things I think I only made them worse.
Right now at http://freezing-night-21.heroku.com I believe I need to send over my extensions because the repo size is 17.6megs and the slug size is 7.6megs. Also the way I read the error message I get.
I'm lost so I start at the end,
$ git push heroku
Quoted 1 line
Everything up-to-date
$ git commit -a U vendor/extensions/forms U vendor/extensions/forms_mail U vendor/extensions/mailer U vendor/extensions/multi_site U vendor/extensions/paperclipped U vendor/extensions/paperclipped_uploader U vendor/extensions/ray U vendor/extensions/rbac_base U vendor/extensions/rbac_page_edit U vendor/extensions/settings U vendor/plugins/attachment_fu fatal: 'commit' is not possible because you have unmerged files.
I'm lost, I tried a variety of commands but nothing seems to work on these extensions. I had several RB files on this list before so I hit git add <file> and now they don't show up. Can't really do that extension dirs though.
Anyways, I don't care if I start from scratch and do it properly or if I'm just one step away from having the page that I want up and running. I'd just like it up. It's a very simple page and it's taken many more hours to deploy than to create because the documentation tends to be mmm...technical. Any help would be greatly appreciated, I am trying to make a site for community good!
Signature · 2 lines
View this message in context: http://old.nabble.com/Beg.-Level%3A-Send-Radiant-CMS-w-extensions-to-Heroku-tp29042313p29042313.html Sent from the git mailing list archive at Nabble.com.
Quoted 36 lines · Geirsman
Hey,
I made the page I wanted locally with Radiant CMS and several extensions. Then when I went to send it to Heroku I ran into a variety of errors, first SSH, then I think I sent over the gems but not the extensions. And in attempting to fix things I think I only made them worse.
Right now at http://freezing-night-21.heroku.com I believe I need to send over my extensions because the repo size is 17.6megs and the slug size is 7.6megs. Also the way I read the error message I get.
I'm lost so I start at the end,
$ git push herokuQuoted 2 lines
Everything up-to-date
$ git commit -a U vendor/extensions/forms U vendor/extensions/forms_mail U vendor/extensions/mailer U vendor/extensions/multi_site U vendor/extensions/paperclipped U vendor/extensions/paperclipped_uploader U vendor/extensions/ray U vendor/extensions/rbac_base U vendor/extensions/rbac_page_edit U vendor/extensions/settings U vendor/plugins/attachment_fu fatal: 'commit' is not possible because you have unmerged files.I'm lost, I tried a variety of commands but nothing seems to work on these extensions. I had several RB files on this list before so I hit git add <file> and now they don't show up. Can't really do that extension dirs though.
Quoted 7 lines
Anyways, I don't care if I start from scratch and do it properly or if I'm just one step away from having the page that I want up and running. I'd just like it up. It's a very simple page and it's taken many more hours to deploy than to create because the documentation tends to be mmm...technical. Any help would be greatly appreciated, I am trying to make a site for community good!
This is just a complete guess but you probably have previous merge conflict that needs resolving.
The output of 'git status' should tell you something about files being 'unmerged' or having conflicts (sorry I can't remember the exact wording). If you do have any conflicts open the files in a text editor and search for the conflict markers '>>>>>>>' fix-up the files and double check that everything looks OK. After that you need to tell git that the conflicts have been handled with 'git add <filename>' you should then be able to commit.
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Sorry if there are double ups. I obviously haven't configured Thunderbird not to sent HTML.Back to gmail web interface it is.
Quoted 50 lines · Daniel Samay
On Thu, Jul 1, 2010 at 10:57 AM, Chris Packham <[email protected]> wrote:
Quoted 36 lines · Geirsman
Hey,
I made the page I wanted locally with Radiant CMS and several extensions. Then when I went to send it to Heroku I ran into a variety of errors, first SSH, then I think I sent over the gems but not the extensions. And in attempting to fix things I think I only made them worse.
Right now at http://freezing-night-21.heroku.com I believe I need to send over my extensions because the repo size is 17.6megs and the slug size is 7.6megs. Also the way I read the error message I get.
I'm lost so I start at the end,
$ git push herokuQuoted 2 lines
Everything up-to-date
$ git commit -a U vendor/extensions/forms U vendor/extensions/forms_mail U vendor/extensions/mailer U vendor/extensions/multi_site U vendor/extensions/paperclipped U vendor/extensions/paperclipped_uploader U vendor/extensions/ray U vendor/extensions/rbac_base U vendor/extensions/rbac_page_edit U vendor/extensions/settings U vendor/plugins/attachment_fu fatal: 'commit' is not possible because you have unmerged files.I'm lost, I tried a variety of commands but nothing seems to work on these extensions. I had several RB files on this list before so I hit git add <file> and now they don't show up. Can't really do that extension dirs though.
Quoted 7 lines
Anyways, I don't care if I start from scratch and do it properly or if I'm just one step away from having the page that I want up and running. I'd just like it up. It's a very simple page and it's taken many more hours to deploy than to create because the documentation tends to be mmm...technical. Any help would be greatly appreciated, I am trying to make a site for community good!
This is just a complete guess but you probably have previous merge conflict that needs resolving.
Quoted 7 lines
The output of 'git status' should tell you something about files being 'unmerged' or having conflicts (sorry I can't remember the exact wording). If you do have any conflicts open the files in a text editor and search for the conflict markers '>>>>>>>' fix-up the files and double check that everything looks OK. After that you need to tell git that the conflicts have been handled with 'git add <filename>' you should then be able to commit.
Hey thanks for the reply, it wasn't showing up on the old nabble because I was not subscribed. I am now, but I believe I'd have to repost.
No problem. Just keep the list on the Cc someone who knows more might decide to help. You don't need to subscribe the git mailing list allows non-subscriber posts and the convention is to Cc all participants (as well as the list) so you won't miss out.
I forgot to mention git status results
$ git status
Quoted 3 lines
(my wording) 3 changes need to be commited (environment.rb, environment.bak, and boot.rb) the extensions mentioned in my first post need to be merged
roughly 500-1,000 lines of "deleted" xyz
I found the conflict markers in 3 files - environment.rb, environment.bak, and boot.rb and then I git added them. However now I am left with all the extension files/folders.
Hmm. Did you mean to delete those files? If so you can tell git that you meant to with 'git rm <files>' or you can get them back with 'git checkout <files>'.
For your extensions it looks like they are "updated but unmerged" I'm not entirely sure what that means but once again 'git add'ing them should hopefully sort them out. Alternatively 'git checkout vendor/extensions/*' will get them back from the stored versions but if you have any uncommitted changes in them they will be lost.
You might want to let us know how you got to where you are from the start. It sounds like you may be tripping over some of the DVCS concepts that people who have used traditional VCSes run into.
e.g. i did the following
git clone blah
<hack hack hack>
git pull
<more hacking>
git add
git commit
git push
I ordered a Git book but it'll be a couple days before it gets here.
Lost of free resources are available on the web. I'd recommend the git community book [1], git tutorial [2] and the full manual [3]
[1] http://book.git-scm.com/
[2] http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
[3] http://www.kernel.org/pub/software/scm/git/docs/