{"thread":{"id":"24248","subject":"Beg. Level: Send Radiant CMS w/extensions to Heroku","startedAt":"2010-07-01T06:15:18Z","lastAt":"2010-07-01T17:47:55Z","messageCount":3,"participants":["Geirsman","Chris Packham"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"144565","messageId":"29042313.post@talk.nabble.com","threadId":"24248","inReplyTo":null,"subject":"Beg. Level: Send Radiant CMS w/extensions to Heroku","fromName":"Geirsman","fromEmail":"dsamay@gmail.com","sentAt":"2010-07-01T06:15:18Z","receivedAt":"2010-07-01T06:15:18Z","isPatch":false,"sender":{"key":"dsamay@gmail.com","avatar":null},"body":"\nHey,\n\nI made the page I wanted locally with Radiant CMS and several extensions.\nThen when I went to send it to Heroku I ran into a variety of errors, first\nSSH, then I think I sent over the gems but not the extensions. And in\nattempting to fix things I think I only made them worse.\n\nRight now at http://freezing-night-21.heroku.com I believe I need to send\nover my extensions because the repo size is 17.6megs and the slug size is\n7.6megs. Also the way I read the error message I get. \n\nI'm lost so I start at the end, \n\n$ git push heroku\n> Everything up-to-date\n\n$ git commit -a\nU\tvendor/extensions/forms\nU\tvendor/extensions/forms_mail\nU\tvendor/extensions/mailer\nU\tvendor/extensions/multi_site\nU\tvendor/extensions/paperclipped\nU\tvendor/extensions/paperclipped_uploader\nU\tvendor/extensions/ray\nU\tvendor/extensions/rbac_base\nU\tvendor/extensions/rbac_page_edit\nU\tvendor/extensions/settings\nU\tvendor/plugins/attachment_fu\nfatal: 'commit' is not possible because you have unmerged files.\n\nI'm lost, I tried a variety of commands but nothing seems to work on these\nextensions. I had several RB files on this list before so I hit git add\n<file> and now they don't show up. Can't really do that extension dirs\nthough.\n\nAnyways, I don't care if I start from scratch and do it properly or if I'm\njust one step away from having the page that I want up and running. I'd just\nlike it up. It's a very simple page and it's taken many more hours to deploy\nthan to create because the documentation tends to be mmm...technical. Any\nhelp would be greatly appreciated, I am trying to make a site for community\ngood!\n-- \nView this message in context: http://old.nabble.com/Beg.-Level%3A-Send-Radiant-CMS-w-extensions-to-Heroku-tp29042313p29042313.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"144607","messageId":"4C2CBAD9.60701@gmail.com","threadId":"24248","inReplyTo":"29042313.post@talk.nabble.com","subject":"Re: Beg. Level: Send Radiant CMS w/extensions to Heroku","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2010-07-01T15:57:13Z","receivedAt":"2010-07-01T15:57:13Z","isPatch":false,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"On 30/06/10 23:15, Geirsman wrote:\n> Hey,\n>\n> I made the page I wanted locally with Radiant CMS and several extensions.\n> Then when I went to send it to Heroku I ran into a variety of errors, first\n> SSH, then I think I sent over the gems but not the extensions. And in\n> attempting to fix things I think I only made them worse.\n>\n> Right now at http://freezing-night-21.heroku.com I believe I need to send\n> over my extensions because the repo size is 17.6megs and the slug size is\n> 7.6megs. Also the way I read the error message I get. \n>\n> I'm lost so I start at the end, \n>\n> $ git push heroku\n>   \n>> Everything up-to-date\n>>     \n> $ git commit -a\n> U\tvendor/extensions/forms\n> U\tvendor/extensions/forms_mail\n> U\tvendor/extensions/mailer\n> U\tvendor/extensions/multi_site\n> U\tvendor/extensions/paperclipped\n> U\tvendor/extensions/paperclipped_uploader\n> U\tvendor/extensions/ray\n> U\tvendor/extensions/rbac_base\n> U\tvendor/extensions/rbac_page_edit\n> U\tvendor/extensions/settings\n> U\tvendor/plugins/attachment_fu\n> fatal: 'commit' is not possible because you have unmerged files.\n>\n> I'm lost, I tried a variety of commands but nothing seems to work on these\n> extensions. I had several RB files on this list before so I hit git add\n> <file> and now they don't show up. Can't really do that extension dirs\n> though.\n>\n> Anyways, I don't care if I start from scratch and do it properly or if I'm\n> just one step away from having the page that I want up and running. I'd just\n> like it up. It's a very simple page and it's taken many more hours to deploy\n> than to create because the documentation tends to be mmm...technical. Any\n> help would be greatly appreciated, I am trying to make a site for community\n> good!\n>   \nThis is just a complete guess but you probably have previous merge\nconflict that needs resolving.\n\nThe output of 'git status' should tell you something about files being\n'unmerged' or having conflicts (sorry I can't remember the exact\nwording). If you do have any conflicts open the files in a text editor\nand search for the conflict markers '>>>>>>>' fix-up the files and\ndouble check that everything looks OK. After that you need to tell git\nthat the conflicts have been handled with 'git add <filename>' you\nshould then be able to commit.\n"},{"id":"144615","messageId":"AANLkTimxEppGHi327xQA6ex8Q0-1EUPyWiOb104uOgkO@mail.gmail.com","threadId":"24248","inReplyTo":"4C2CD32A.80501@gmail.com","subject":"Beg. Level: Send Radiant CMS w/extensions to Heroku","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2010-07-01T17:47:55Z","receivedAt":"2010-07-01T17:47:55Z","isPatch":false,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"Sorry if there are double ups. I obviously haven't configured\nThunderbird not to sent HTML.Back to gmail web interface it is.\n\nOn 01/07/10 09:21, Daniel Samay wrote:\n>\n> On Thu, Jul 1, 2010 at 10:57 AM, Chris Packham <judge.packham@gmail.com> wrote:\n>\n> On 30/06/10 23:15, Geirsman wrote:\n> > Hey,\n> >\n> > I made the page I wanted locally with Radiant CMS and several extensions.\n> > Then when I went to send it to Heroku I ran into a variety of errors, first\n> > SSH, then I think I sent over the gems but not the extensions. And in\n> > attempting to fix things I think I only made them worse.\n> >\n> > Right now at http://freezing-night-21.heroku.com I believe I need to send\n> > over my extensions because the repo size is 17.6megs and the slug size is\n> > 7.6megs. Also the way I read the error message I get.\n> >\n> > I'm lost so I start at the end,\n> >\n> > $ git push heroku\n> >\n> >> Everything up-to-date\n> >>\n> > $ git commit -a\n> > U     vendor/extensions/forms\n> > U     vendor/extensions/forms_mail\n> > U     vendor/extensions/mailer\n> > U     vendor/extensions/multi_site\n> > U     vendor/extensions/paperclipped\n> > U     vendor/extensions/paperclipped_uploader\n> > U     vendor/extensions/ray\n> > U     vendor/extensions/rbac_base\n> > U     vendor/extensions/rbac_page_edit\n> > U     vendor/extensions/settings\n> > U     vendor/plugins/attachment_fu\n> > fatal: 'commit' is not possible because you have unmerged files.\n> >\n> > I'm lost, I tried a variety of commands but nothing seems to work on these\n> > extensions. I had several RB files on this list before so I hit git add\n> > <file> and now they don't show up. Can't really do that extension dirs\n> > though.\n> >\n> > Anyways, I don't care if I start from scratch and do it properly or if I'm\n> > just one step away from having the page that I want up and running. I'd just\n> > like it up. It's a very simple page and it's taken many more hours to deploy\n> > than to create because the documentation tends to be mmm...technical. Any\n> > help would be greatly appreciated, I am trying to make a site for community\n> > good!\n> >\n> This is just a complete guess but you probably have previous merge\n> conflict that needs resolving.\n>\n> The output of 'git status' should tell you something about files being\n> 'unmerged' or having conflicts (sorry I can't remember the exact\n> wording). If you do have any conflicts open the files in a text editor\n> and search for the conflict markers '>>>>>>>' fix-up the files and\n> double check that everything looks OK. After that you need to tell git\n> that the conflicts have been handled with 'git add <filename>' you\n> should then be able to commit.\n\nHey thanks for the reply, it wasn't showing up on the old nabble\nbecause I was not subscribed. I am now, but I believe I'd have to\nrepost.\n\nNo problem. Just keep the list on the Cc someone who knows  more might\ndecide to help. You don't need to subscribe the git mailing list\nallows non-subscriber posts and the convention is to Cc all\nparticipants (as well as the list) so you won't miss out.\n\nI forgot to mention git status results\n\n$ git status\n> (my wording) 3 changes need to be commited (environment.rb, environment.bak, and boot.rb)\n> the extensions mentioned in my first post need to be merged\n> roughly 500-1,000 lines of \"deleted\" xyz\n\nI found the conflict markers in 3 files - environment.rb,\nenvironment.bak, and boot.rb and then I git added them. However now I\nam left with all the extension files/folders.\n\nHmm. Did you mean to delete those files? If so you can tell git that\nyou meant to with 'git rm <files>' or you can get them back with 'git\ncheckout <files>'.\n\nFor your extensions it looks like they are \"updated but unmerged\" I'm\nnot entirely sure what that means but once again 'git add'ing them\nshould hopefully sort them out. Alternatively 'git checkout\nvendor/extensions/*' will get them back from the stored versions but\nif you have any uncommitted changes in them they will be lost.\n\nYou might want to let us know how you got to where you are from the\nstart. It sounds like you may be tripping over some of the DVCS\nconcepts that people who have used traditional VCSes run into.\n\ne.g. i did the following\n  git clone blah\n  <hack hack hack>\n  git pull\n  <more hacking>\n  git add\n  git commit\n  git push\n\nI ordered a Git book but it'll be a couple days before it gets here.\n\nLost of free resources are available on the web. I'd recommend the git\ncommunity book [1], git tutorial [2] and the full manual [3]\n\n[1] http://book.git-scm.com/\n[2] http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html\n[3] http://www.kernel.org/pub/software/scm/git/docs/\n"}]}