Need some basic github help

Posted on 2011-09-22
Medium Priority
Last Modified: 2012-08-13
I am trying to learn github to deploy a webpage. Here are the steps I am taking

git checkout master
git pull origin master
git checkout –b my-awesome-branch

Do some work, do a git status to check on everything, everything is ok

git add .
git commit –m "awesome message here"
git push origin my-awesome-branch
Git checkout integration
Git merge my-awesome-branch
Git push origin integration
cap development deploy

this will push a file to the dev server we have so people can look at it - this worked fine for me you won't be able to see the link but it generates something like this:

Let's go live (pretending there are no further changes)

git checkout master
Git merge my-awesome-branch
git push origin master
cap production deploy

In theory, the file should push to the live website (which would be http://mywebsite.com/events/email/welcome) but that webpage is not created when i cap production deploy.

Another developer more familiar with this system says :
It looks like you forked "my party events" repo and have pushed the master there. You'll want to push master to the upstream remote (the main ",y party events", or my_events repo.

I don't follow this step. Can anyone follow this logic? If so, do you have a suggestion for me on what i may be doing wrong? Any help is appreciated.

Question by:lvollmer

Accepted Solution

kristinalim earned 2000 total points
ID: 36585333
I think what the other developer is saying is that you have two main repositories or copies of your source code (I could imagine one is internal to your network and the other accessible over the Internet), and your deploy script is using the second copy which you haven't updated with your local changes. So you also need to push changes to the other repository which your deploy script uses.

In your case, "origin" is a repository. When you switch to the "master" branch with `git checkout master` and do `git push origin master`, you are saying to push your copy of the current branch ("master") to the "master" branch of the "origin" repository.

If this is corrent, you would have to add the other repository to your git configuration (a repository is called a "remote") and use as needed:

git remote add github git@github.com:yourcompany/yourapp.git
git fetch github
git push github master
# Or if naming of branches is the same, just `git push github`
# to push the current branch.

Open in new window


Author Closing Comment

ID: 36587112
this was the exact problem, thank you!!!

Featured Post

7 new features that'll make your work life better

It’s our mission to create a product that solves the huge challenges you face at work every day. In case you missed it, here are 7 delightful things we've added recently to monday to make it even more awesome.

Question has a verified solution.

Are you are experiencing a similar issue? Get a personalized answer when you ask a related question.

Have a better answer? Share it in a comment.

Join & Write a Comment

By following these Magento e-commerce development tips, you can increase your website's conversion and profitability. Read this post for more details.
Now many of you may wonder how you can reach great design with least number of essentials. Isn’t stuffing ‘more and more number of elements that speak for the purpose’ the right way to do it? Erm, not always, and in this write-up, you will see why.
Viewers will get an overview of the benefits and risks of using Bitcoin to accept payments. What Bitcoin is: Legality: Risks: Benefits: Which businesses are best suited?: Other things you should know: How to get started:
The purpose of this video is to demonstrate how to set up the WordPress backend so that each page automatically generates a Mailchimp signup form in the sidebar. This will be demonstrated using a Windows 8 PC. Tools Used are Photoshop, Awesome…
Suggested Courses

607 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question