Jimmy,
So what I should have done was create a new remote tracking branch on
heroku named "crm" and then pulled from it to create a branch locally?
In the meantime, I merged my "crm" branch back into "master" so that's ok.
Thanks,
Wes
On 10/14/10 7:31 PM, Jimmy Thrasher wrote:
Hi Wes,
This is basic Git repo behavior. The commit your crm branch points to
isn't a direct descendent of your Heroku repository's master branch.
You can force it by doing: git push -f heroku crm:master
but I'm not sure that's what you want... it'll change heroku/master to
be something and might cause wonkiness in your local repository later
on down the road.
Of course, it's fine if later on you do 'git push -f heroku master'
(which is the same as 'git push -f heroku master:master'). Just be
sure you understand everything that's going on. :)
Jimmy
On Thu, Oct 14, 2010 at 8:09 PM, Wes Gamble <[email protected]
<mailto:[email protected]>> wrote:
I tried the following command:
$ git push heroku crm:master
To [email protected]: <mailto:[email protected]:><my_repo>.git
! [rejected] crm -> master (non-fast forward)
error: failed to push some refs to '[email protected]:
<mailto:[email protected]:><my_repo>.git'
Any idea why this might fail?
Thanks,
Wes
--
You received this message because you are subscribed to the Google
Groups "Heroku" group.
To post to this group, send email to [email protected]
<mailto:[email protected]>.
To unsubscribe from this group, send email to
[email protected]
<mailto:heroku%[email protected]>.
For more options, visit this group at
http://groups.google.com/group/heroku?hl=en.
--
+1-919-627-7546
--
You received this message because you are subscribed to the Google
Groups "Heroku" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/heroku?hl=en.
--
You received this message because you are subscribed to the Google Groups
"Heroku" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/heroku?hl=en.
