From: Chris Packham <judge.packham@gmail.com>
To: Geirsman <dsamay@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Beg. Level: Send Radiant CMS w/extensions to Heroku
Date: Thu, 01 Jul 2010 08:57:13 -0700 [thread overview]
Message-ID: <4C2CBAD9.60701@gmail.com> (raw)
In-Reply-To: <29042313.post@talk.nabble.com>
On 30/06/10 23:15, Geirsman wrote:
> 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
>
>> 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!
>
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.
next prev parent reply other threads:[~2010-07-01 15:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 6:15 Beg. Level: Send Radiant CMS w/extensions to Heroku Geirsman
2010-07-01 15:57 ` Chris Packham [this message]
[not found] ` <AANLkTin9XwWymJuxKOeoc5z9mIVMY2mQXYv-xcihBe96@mail.gmail.com>
[not found] ` <4C2CD32A.80501@gmail.com>
2010-07-01 17:47 ` Chris Packham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C2CBAD9.60701@gmail.com \
--to=judge.packham@gmail.com \
--cc=dsamay@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.