I work with various developers on various apps.
I need to know how my workflow can be improved.
- Within the repository the ‘master’ is always an exact copy of the live code.
- For each set of features we create a branch.
- We name the branch by the version number v1, v1-0-1, v1-0-2, v1.1, etc
- We are able to test locally and on a dev server using the subdomain as the branch name.
i.e. http://version.mydomain.com– pulled with a post-commit - When we are ready I merge the version into the master – test again, then launch
Most importantly…
How could this workflow generally be improved?
And secondarily…
I often have to deal with conflicts when merging into master – can this be avoided?
In the last stage I wonder if I should be using a ‘rebase’ rather than a ‘merge’?
Thanks!
Have you considered git-flow? We have just switched over to it from a system similar to your description and it’s made a world of difference. There’s also a set of command line tools to support it.