The problem scenario is that I pulled a feature from develop to develop new functions. After the development was completed, I merged it back into develop. Then at this time, the demand side proposed another change... What is the best way to deal with it at this time? Should I delete the previous feature branch and pull a new feature branch, or modify it directly on develop? Or continue to modify the original feature, and merge it back to develop again after the modification?
天蓬老师2017-05-02 09:41:32
Continue to modify the original feature, and merge it back into develop after modification
PHPz2017-05-02 09:41:32
Thank you for the invitation.
First submit and merge the developed version to the server, thus ensuring the uniqueness of the developed version corresponding to the version number
There is no need to delete the branch. After submitting the code, you can develop it according to new requirements, or you can clone a new branch
In short, this is not a problem, even if it depends on your own personal habits. You can delete, commit, merge, and clone again
滿天的星座2017-05-02 09:41:32
Even if you continue to develop on the original feature branch, you still need to merge the develop branch to this feature branch regularly.
This is not essentially different from deleting the old feature branch and pulling a new feature branch from develop.
It is not good to change directly on develop. Since you use the feature branch to develop, don't make changes directly in the develop branch.
黄舟2017-05-02 09:41:32
When feature development is completed and merged back to develop, the branch should have been killed
Open new features if there are new needs
General developers are not allowed to push on develop. The permissions of develop should only be open to people such as development team leaders