<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div><br></div><div><br></div><div>Don't know. I am not biased here.</div><div><br></div><div>Any git pro's out there that can outline the benefit's drawbacks of each approach?</div><div><br></div><div>Regards, Heiko</div><br><div><div>On May 9, 2012, at 2:00 PM, <a href="mailto:ssilvert@redhat.com">ssilvert@redhat.com</a> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">
<meta content="text/html; charset=windows-1252" http-equiv="Content-Type">
<div bgcolor="#FFFFFF" text="#000000">
Shouldn't we stay consistent with the way AS is doing it where
"master" is the development branch?<br>
<a class="moz-txt-link-freetext" href="https://community.jboss.org/wiki/HackingonAS7">https://community.jboss.org/wiki/HackingonAS7</a><br>
<br>
On 5/9/2012 6:09 AM, Heiko Braun wrote:
<blockquote cite="mid:B31D4CA4-D096-422D-9794-87C3F948F28F@redhat.com" type="cite">
<div><br>
</div>
<div><br>
</div>
<div>Beginning this week, we start using a slightly different
commit policy on the console repository. Instead of boring you
with the technical details why it's necessary, let me put it
this way:</div>
<div><br>
</div>
<div>"My limited gitjitsu skills broke the parent child
relationship of the repositories and branches."</div>
<div><br>
</div>
<div><br>
</div>
<div><b>Official Repository</b></div>
<div><br>
</div>
<div>The authoritative repository from now is the one that resides
with the JBossAS project on github:</div>
<div><a moz-do-not-send="true" href="https://github.com/jbossas/console">https://github.com/jbossas/console</a></div>
<div><br>
</div>
<div><br>
</div>
<div><b>Contributions</b></div>
<div><b><br>
</b></div>
<div>All contributors would need to fork from that repository and
send pull request against the development branch.</div>
<div><br>
</div>
<div><u>What does that mean?</u></div>
<div><br>
</div>
<div>You'd probably have to nuke your exiting fork on github and
start over. </div>
<div>(All pending changes should have been submitted already) </div>
<div><br>
</div>
<div>Moving forward we maintain two main branches: "<i>master</i>"
and "<i>develop</i>".</div>
<div><br>
</div>
<div>- "<i>master</i>" is what's currently used by the JBossAS
(most recent release). </div>
<div>- "<i>develop</i>" is work in progress.</div>
<div><br>
</div>
<div>With this in mind, make sure you work on the "<i>develop</i>"
branch. Create feature branches from it and rebase against
"jbossas/console#develop" regularly. When done, send me the pull
request.</div>
<div><br>
</div>
<div>With every release, we merge the "<i>develop</i>" branch with
"<i>master</i>" and move on.</div>
<div><br>
</div>
<div><br>
</div>
<div><br>
</div>
<div>Thanks for your patience and sorry for the mess. But things
are getting better this way, promise.</div>
<div><br>
</div>
<div>Regards, Heiko</div>
<div><br>
</div>
<div><br>
</div>
<div><br>
</div>
<div><br>
</div>
<div><br>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
jboss-as7-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:jboss-as7-dev@lists.jboss.org">jboss-as7-dev@lists.jboss.org</a>
<a class="moz-txt-link-freetext" href="https://lists.jboss.org/mailman/listinfo/jboss-as7-dev">https://lists.jboss.org/mailman/listinfo/jboss-as7-dev</a>
</pre>
</blockquote>
<br>
</div>
</blockquote></div><br></body></html>