All they have to do is checkout the feature branch and continue on with the process. Anyone on our team can step in and pick up this process at any point. Normally all of this process is done by the original author but that is not required. The develop branch is pushed to GitHub (GitHub will automatically mark the pull request as closed/merged when this happens).Once all changes are incorporated on the feature branch the feature branch is finished: git flow feature finish module_1.Any changes from the pull request are made to the feature branch.The team reviews the pull request and makes comments.When the feature is completed a pull request is opened in GitHub comparing develop and the feature branch module_1.As changes are committed they are pushed to GitHub (or once at the end if preferred).The code is updated on the feature branch.Create a feature branch: git flow feature start module_1.The process the team I work with uses for this is as follows: Our next step will probably be to reimplement some parts of git flow (as it is mainly about chaining git commands) to take this into account (having the "cleaning" part of the finish, without the merge). This is consistent with our practice, with the downside of requiring to delete the branch ourselves (as we do not git flow finish). There is not git flow feature finish (as the branch is already merged).The pull request is merged using GitHub by the reviewer.The review take place, with potential additional commits. When done, he create a pull request (using github).Someone use git flow to create a feature branch.The problem we have is with git feature finish, as it merge the branch into the develop, while we want a pull request to be sent and (this is important) merged by the reviewer, not the committer, to emphasize team ownership. We really like git flow, as it use a good level of semantic (using the same level that you use in team discussion : "I'll start feature A" more than "I'll create a branch, checkout it"), while git is very "implementation" level (which is good and useful also, but different). We stumbled on this exact problem recently.
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |