<html>
<head>
    <base href="https://wiki.asterisk.org/wiki">
            <link rel="stylesheet" href="/wiki/s/2030/1/7/_/styles/combined.css?spaceKey=TOP&amp;forWysiwyg=true" type="text/css">
    </head>
<body style="background: white;" bgcolor="white" class="email-body">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
    <h2><a href="https://wiki.asterisk.org/wiki/display/TOP/Git+Workflow+%28draft+for+comments%29?focusedCommentId=9568604#comment-9568604">Git Workflow (draft for comments)</a></h2>
        <h4>Page
        <b>comment added</b> by              <a href="https://wiki.asterisk.org/wiki/display/~dlee">David M. Lee</a>
    </h4>
    <br/>
    <div class="notificationGreySide">
       <p>Developer Workflow, step 2.</p>

<p>Elsewhere, I've seen integration repos described as the place for active development.  I think it would make more sense if multi-day work happened directly in integration repos.  (Or, given my comment above, directly in integration/ or development/ branches).  This way commit emails are seen by a wider audience, and commentary can happen sooner.</p>

<p>I see the breakdown as follows:</p>

<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'> Repo/branch </th>
<th class='confluenceTh'> Email? </th>
<th class='confluenceTh'> daemon? </th>
<th class='confluenceTh'> gitweb? </th>
<th class='confluenceTh'> Fisheye? </th>
<th class='confluenceTh'> Rebase freely? </th>
<th class='confluenceTh'> Visibility      </th>
</tr>
<tr>
<td class='confluenceTd'>  private     </td>
<td class='confluenceTd'>  no     </td>
<td class='confluenceTd'>  no      </td>
<td class='confluenceTd'>  no      </td>
<td class='confluenceTd'>  no       </td>
<td class='confluenceTd'>  yes            </td>
<td class='confluenceTd'>  Creator + admins </td>
</tr>
<tr>
<td class='confluenceTd'>  team        </td>
<td class='confluenceTd'>  no     </td>
<td class='confluenceTd'>  yes     </td>
<td class='confluenceTd'>  yes     </td>
<td class='confluenceTd'>  no       </td>
<td class='confluenceTd'>  yes            </td>
<td class='confluenceTd'>  world            </td>
</tr>
<tr>
<td class='confluenceTd'>  integration </td>
<td class='confluenceTd'>  yes    </td>
<td class='confluenceTd'>  yes     </td>
<td class='confluenceTd'>  yes     </td>
<td class='confluenceTd'>  yes      </td>
<td class='confluenceTd'>  no<img class="emoticon" src="/wiki/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"/>          </td>
<td class='confluenceTd'>  world            </td>
</tr>
<tr>
<td class='confluenceTd'>  release     </td>
<td class='confluenceTd'>  yes    </td>
<td class='confluenceTd'>  yes     </td>
<td class='confluenceTd'>  yes     </td>
<td class='confluenceTd'>  yes      </td>
<td class='confluenceTd'>  no             </td>
<td class='confluenceTd'>  world            </td>
</tr>
</tbody></table>
</div>


<p><img class="emoticon" src="/wiki/images/icons/emoticons/star_yellow.gif" height="16" width="16" align="absmiddle" alt="" border="0"/> When an integration branch is reviewed and accepted, it may be rebased onto release/master instead of merged.  Since the branch is deleted immediately after the rebase/merge, this case doesn't matter as much.</p>

<ol>
        <li>Developer runs gitall to pull the Release Repositories' current state</li>
        <li>The developer should create an integration/changeX branch.  Nightly work (or more frequently) would be pushed here.</li>
        <li>Developer would make changes to the component.</li>
        <li>When ready, the developer would push final changes to the integration/changeX branch.</li>
        <li>Developer schedules code review.</li>
        <li>Developer incorporates changes required by code review.</li>
        <li>Developer integrates his reviewed changes to the Release Repository's master branch via a rebase operation.</li>
</ol>

    </div>

        
    <div id="commentsSection" class="wiki-content pageSection">
       <div style="float: right;">
            <a href="https://wiki.asterisk.org/wiki/users/viewnotifications.action" class="grey">Change Notification Preferences</a>
       </div>
       <a href="https://wiki.asterisk.org/wiki/display/TOP/Git+Workflow+%28draft+for+comments%29?focusedCommentId=9568604#comment-9568604">View Online</a>
              |
       <a id="reply-9568604" href="https://wiki.asterisk.org/wiki/display/TOP/Git+Workflow+%28draft+for+comments%29?replyToComment=9568604#comment-9568604">Reply To This</a>
           </div>

</div>
</div>
</div>
</div>
</body>
</html>