git heroku multiple computers workflow

Question

This question is probably due to my lack of understanding something i should! I made a rails app on one machine and deployed it. then cloned it to another machine to make some changes from there. went back to the first machine and created some branches to makes some changes... I know want my first machine to have the heroku stuff.

whats the best strategy for this type of development on multiple machines as a single heroku user?

What I'm doing now is creating a branch, performing a git pull into that branch, then merging the changes.... sound right?

Thanks.

Kevin Sylvestre · Accepted Answer · 2012-10-09 21:49:00Z

2

Git is a decentralized version control system where you can push up and pull down code repositories. The act of deploying to Heroku is synonymous with pushing code. Likewise, to checkout Heroku code, you can simply pull down code.

Although you could use Heroku as the place to push up and pull down your branches (and do all commits), I would strongly recommend that you setup a additional remote repository (I'd recommend GitHub) where you do the majority of your code changes, and only use your Heroku repository for deployments. Then, you can merge and branches or changes into master before deploying.

answered Oct 9, 2012 at 21:49

Kevin Sylvestre

38.2k33 gold badges159 silver badges235 bronze badges

Sign up to request clarification or add additional context in comments.

2 Comments

twinturbotom Over a year ago

that makes a lot of sense... I guess I wanted private repo without paying. Thanks for the recommendation.

twinturbotom Over a year ago

Now i'm running into publish error's. I really have to move to github!

Collectives™ on Stack Overflow

git heroku multiple computers workflow

1 Answer 1

2 Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

2 Comments

Your Answer

Sign up or log in

Post as a guest

Related