Still celebrating National IT Professionals Day with 3 months of free Premium Membership. Use Code ITDAY17

x
?
Solved

Need some basic github help

Posted on 2011-09-22
2
Medium Priority
?
387 Views
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:
http://dev.mywebsite.com/events/email/welcome

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.

0
Comment
Question by:lvollmer
[X]
Welcome to Experts Exchange

Add your voice to the tech community where 5M+ people just like you are talking about what matters.

  • Help others & share knowledge
  • Earn cash & points
  • Learn & ask questions
2 Comments
 
LVL 4

Accepted Solution

by:
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

0
 

Author Closing Comment

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

Featured Post

Concerto's Cloud Advisory Services

Want to avoid the missteps to gaining all the benefits of the cloud? Learn more about the different assessment options from our Cloud Advisory team.

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

FAQ pages provide a simple way for you to supply and for customers to find answers to the most common questions about your company. Here are six reasons why your company website should have a FAQ page
Color can increase conversions, create feelings of warmth or even incite people to get behind a cause. If you want your website to really impact site visitors, then it is vital to consider the impact color has on them.
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:
This tutorial will teach you the core code needed to finalize the addition of a watermark to your image. The viewer will use a small PHP class to learn and create a watermark.
Suggested Courses

661 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