Reputation: 147
I've the following git structure problem within my team. Our structure is as follow:
Branches
And everybody is coding on development, and if they wanna push the changes then they cherry-pick their commits to staging and then merge staging with master.
We want to work with feature branches but I don't know how. The problem is.
How can we add the following structure
Upvotes: 0
Views: 359
Reputation: 535149
Work on a feature branch, one per feature, and after submitting it as a PR and reviewing it among the developers, merge it to development
.
Tell the clients to test. Meanwhile continue working on other feature branches.
When the client approves the feature, merge the same feature branch to staging
. (Even if you have deleted the branch name prematurely, if you used a PR, the branch's last commit remains accessible because the PR exists forever, marking the place.)
Upvotes: 2