Hi All,

I am close to deploying version 1.0 of a new Ruby on Rails
application.  I am a single developer (no team complications) and I
have been using Git and Github as follows:

a.  Make changes to source code and commit to local git repository
(branch = master).
b.  Push the changes to github with this command:  "git push origin
master"
c.  Use Capistrano to deploy changes to the staging server using
github as the repository.
d.  Repeat the above steps for each change.

Now that I am close to deploying version 1.0 to production I have been
trying to figure out an appropriate workflow.  Would the following
work:

a.  Make any final changes and push the changes to the local git
repository (branch = master).
b.  Push the changes to github with this command:  "git push origin
master"
c.  Use Capistrano to deploy changes to the production server using
github as the the repository..
d.  Create a new branch called "release2" in the local git repository.
e.  Continue development of Release 2.0 code in the release2 branch.
f.  If a bug fix is required to version 1 code, commit the changes to
the master branch in the local git repository, do a "git push origin
master" and deploy from the github master branch to production.  Also,
merge the changes into the release2 branch.
g.  When release 2 is done, merge the release2 branch into the master
branch and deploy from master.

Or, is there a better way to do what needs to be done?

I would sincerely appreciate any ideas or suggestions.

Thank you and best regards, Ken
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to