1

I am interesting in this process:

First I'd like to make any in my development branch, than it should be pushed to Test (master) branch and, therefore, to production.

For me the process:

  1. init commit
    then, make prod branch from master init commit
    then, make dev branch from master init commit

  2. checkout to dev branch
    then, do any
    then, commit
    then, checkout to master
    then, merge with dev

  3. Do tests
    then, commit
    then, checkout to prod
    then, merge with master

Is this a right way to use this way or not? If not, explain please the right process.

Thanks a lot

Zoe
  • 27,060
  • 21
  • 118
  • 148
Alexandr
  • 41
  • 5
  • I'd recommend to read this first https://www.atlassian.com/git/tutorials/comparing-workflows/ and http://scottchacon.com/2011/08/31/github-flow.html – Alex G. May 26 '16 at 19:55
  • 'git help everyday' and 'git help workflows' have some good examples. – Gregg May 27 '16 at 02:27

2 Answers2

6

You are looking for something similar to the git flow workflow.
Read all about it in the following post by Vincent Driessen

enter image description here

CodeWizard
  • 128,036
  • 21
  • 144
  • 167
1

That would well if you don't have may feature to develop in parallel.

If you do and said features needs to be integrated, then the gitworkflow (one word) is a better fit.

gitworkflow

The main advantage is that you can merge multiple feature branch, and then decide to remove some of them (because they are still too buggy, not ready)

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250