<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div>My understanding is slightly different, but in any case it aligns with your concern about the feature branches. I don't think that the described git flow requires you to use feature branches for everything. It allows you to do this, but doesn't mandate (I have used it a few times before). Given that we also have code review system in place, it in most cases replaces this process ( "feature branch" is basically a series of patch sets).</div><div><br></div><div>Also, as I understand the flow, the release-* branches are temporary and they go away as soon as the release is finalized and tagged.</div><div><br></div><div>So, the short list of proposed updates:</div><div><br></div><div>- we will create "release-<version>" branch for preparation for <version> release. When the release is finalized, we tag the release and remove the branch.</div><div><br></div><div>- we will have "release" branch that will track the latest release (release = latest release tag)</div><div><br></div><div>- for problems discovered for the released <version>, we can use "hotfix-<version>+" branch, which is merged back to "master" and "release" branches, and then tagged as then next minor release</div><div><br></div><div>- feature branches can be used (if a complex feature needs to be separated in multiple inter-dependent commits before merged to master), but they mostly replaced by the code review process.</div><div><br></div><div>---</div><div>Alex</div><br><div><div>On Jul 16, 2014, at 3:10 PM, Junxiao Shi <<a href="mailto:shijunxiao@email.arizona.edu">shijunxiao@email.arizona.edu</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><p>Dear folks</p><p>As I understand, the git flow model + change of master role results in the following:</p><p>* releases are tagged, and also have branches with prefix "release-"<br>
* features need feature branches<br>
* feature branches are merged into master branch, which reflects latest developments</p><p>This differs from current practice in that:</p><p>* release branches add "release-" prefix<br>
* feature branches are used</p><p>I agree with adding a "release-" prefix to release branches.</p><p>I disagree with using feature branches, because merging conflicts would be a problem.<br>
Every Change should still target to master branch.</p><p>Yours, Junxiao</p>
<div class="gmail_quote">On Jul 17, 2014 5:01 AM, "Alex Afanasyev" <<a href="mailto:alexander.afanasyev@ucla.edu">alexander.afanasyev@ucla.edu</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin: 0px 0px 0px 0.8ex; border-left-width: 1px; border-left-color: rgb(204, 204, 204); border-left-style: solid; padding-left: 1ex; position: static; z-index: auto;">
Hi guys,<br>
<br>
I have a proposal to slightly modify the current policy for branching in our repos to partially match the git flow model described <a href="http://nvie.com/posts/a-successful-git-branching-model/" target="_blank">http://nvie.com/posts/a-successful-git-branching-model/</a>.<br>
<br>
The part I'm not entirely agreeing with is the role that devoted to master branch in this model: it always points to the latest release. Personally, 'master' branch for me is the place for development, while there could be other "release" branch to track latest releases. The rest of the workflow generally follows what we have been doing in the past, just formalized operations a little.<br>
<br>
If agreed, I will create "release-0.2.0" branch in both repos that will fix all the features for the upcoming release. All pending/approved commits on gerrit then can be merged into master, which will track further development.<br>
<br>
Any objections?<br>
<br>
---<br>
Alex<br>
<br>
<br>
_______________________________________________<br>
Nfd-dev mailing list<br>
<a href="mailto:Nfd-dev@lists.cs.ucla.edu">Nfd-dev@lists.cs.ucla.edu</a><br>
<a href="http://www.lists.cs.ucla.edu/mailman/listinfo/nfd-dev" target="_blank">http://www.lists.cs.ucla.edu/mailman/listinfo/nfd-dev</a><br>
</blockquote></div>
</blockquote></div><br></body></html>