Cannot click on hero after adding remote heroku repeater to existing local repo

Question

Here is the scenario:

1) My project partner and I worked on a Ruby on Rails application together using github as our repo code.

2) The application is under her github account and she added me as an employee

3) She turned around in Geroku and added me as a co-author there

4) I used the following command from my existing application directory with the intention of adding the existing Heroku remote application as remote to the existing local application. In my existing local application, as I mentioned earlier, there was already a remote github

git remote add heroku [e-mail] :codefellow.git 

5) I made some changes and clicked them on github, and everything was up to date

6) Then I tried to click on the hero with the next team

 git push heroku master 

7) It gave me an error saying that the tip of my branch is behind, as shown below, but when I tried to pull it from github, he said that I was in the know, as shown below

 ➜ code-fellows-alumni git:(master) git push heroku master To [e-mail] :codefellow.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to ' [e-mail] :codefellow.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Merge the remote changes (eg 'git pull') hint: before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ➜ code-fellows-alumni git:(master) git pull Already up-to-date. 

So does anyone know what is going on here? How does my local branch not sync with Heroku if I keep up to date with Github? Is it possible for my project partner to make changes to Heroku without dropping them first on Github? I checked and she doesn’t have the app plug. I can’t contact her at the moment to know exactly what she could do - I’m not even sure that she would allow her to make changes to Heroka if they hadn’t been pushed to Github. Any ideas would be greatly appreciated. I don’t want to clone the application from Heroku, because I already have local synchronization with Github. I want to use Github as a code repository, and I don't want to start with a clone from Heroku. I already looked at Heroku documentation on this subject: https://devcenter.heroku.com/articles/git . He just says to make a clone, but I do not want to do this for the above reasons. I followed the directions given in the answer to this question ( How to link a folder to an existing Heroku application ) to get this far, but it seems that there is a missing part or my project partner did something unusual. Thanks in advance for any helpful ideas you may have.

Answer 1

The message you see means that the changes have been made to an application that you do not have in your local copy. When you reject it because the Heroku remote moves further than yours, so you are right in thinking that your partner clicked on Heroku without clicking Github - this is a normal scenario, since you deploy from your local repository when deploying to Heroku, unlike Capistrano’s traditional deployment, which typically deploys code from Github.

It is up to you, as a team, to come up with ways of working that interfere with this, but if you need to work now, you can

• git push heroku master -f . This forces your changes and overwrites what is currently with your code.
• git pull heroku master to pull the changes from Heroku to a local repo, which should then allow you to do git push heroku master when you have the changes.