<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<body link="#355491" alink="#4262a1" vlink="#355491" style="background: #e2e2e2; margin: 0; padding: 20px;">
<div>
<table cellpadding="0" bgcolor="#FFFFFF" border="0" cellspacing="0" style="border: 1px solid #dadada; margin-bottom: 30px; width: 100%; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tbody>
<tr>
<td>
<table border="0" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" style="border: solid 2px #ccc; background: #dadada; width: 100%; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tbody>
<tr>
<td bgcolor="#000000" valign="middle" height="58px" style="border-bottom: 1px solid #ccc; padding: 20px; -moz-border-radius-topleft: 3px; -moz-border-radius-topright: 3px; -webkit-border-top-right-radius: 5px; -webkit-border-top-left-radius: 5px;">
<h1 style="color: #333333; font: bold 22px Arial, Helvetica, sans-serif; margin: 0; display: block !important;">
<!-- To have a header image/logo replace the name below with your img tag -->
<!-- Email clients will render the images when the message is read so any image -->
<!-- must be made available on a public server, so that all recipients can load the image. -->
<a href="http://community.jboss.org/index.jspa" style="text-decoration: none; color: #E1E1E1">JBoss Community</a></h1>
</td>
</tr>
<tr>
<td bgcolor="#FFFFFF" style="font: normal 12px Arial, Helvetica, sans-serif; color:#333333; padding: 20px; -moz-border-radius-bottomleft: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 5px; -webkit-border-bottom-left-radius: 5px;"><h3 style="margin: 10px 0 5px; font-size: 17px; font-weight: normal;">
How I work with github jboss-as
</h3>
<span style="margin-bottom: 10px;">
created by <a href="http://community.jboss.org/people/thomas.diesler%40jboss.com">Thomas Diesler</a> in <i>JBoss AS7 Development</i> - <a href="http://community.jboss.org/message/573577#573577">View the full discussion</a>
</span>
<hr style="margin: 20px 0; border: none; background-color: #dadada; height: 1px;">
<div class="jive-rendered-content"><p><span>Probably like everybody else I fork </span><a class="jive-link-external-small" href="https://github.com/jbossas/jboss-as" target="_blank">https://github.com/jbossas/jboss-as</a><span> using the github web UI.</span></p><p>Then I clone my fork to my local workspace</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><pre class="jive-pre"><code class="jive-code">$ git clone git@github.com:jbosgi/jboss-as.git
$ cd jboss-as
</code></pre><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>I never commit anything to master. Instead, I checkout a feature branch and create a remote config to the upstream repo</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><pre class="jive-pre"><code class="jive-code">$ git remote add upstream git://github.com/jbossas/jboss-as.git
$ git checkout -b the-next-cool-thing
Switched to a new branch 'the-next-cool-thing'
</code></pre><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>When the upstream master moves on I pull those changes in my master and push it to my public fork</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><pre class="jive-pre"><code class="jive-code">$ git checkout master
Switched to branch 'master'
$ git pull upstream master
remote: Counting objects: 581, done
$ git push origin master
...
To git@github.com:jbosgi/jboss-as.git
   b55e9a0..bcad431  master -> master
</code></pre><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>This can be done by a cronjob and keeps my master in sync with the upstream master</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>I don't rebase a branch that I've pushed to a public repo because it breaks forks that where taken from that branch. Instead I regularly merge the changes from master to my feature branch.</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><pre class="jive-pre"><code class="jive-code">$ git checkout the-next-cool-thing
$ get merge master
Updating b55e9a0..bcad431
Fast-forward
$ git push origin the-next-cool-thing
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:jbosgi/jboss-as.git
* [new branch]      the-next-cool-thing -> the-next-cool-thing
</code></pre><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>The beauty of git is that it can detect commits that were already applied. So my merges from master can be reapplied to master any time. When I'm done with the next cool thing I send a pull request to <a class="jive-link-external-small" href="http://">jbossas-pull-requests@lists.jboss.org</a> and wait for however long it takes for my changes to show up on master. I resolve the issue in JIRA and reopen/assign to somebody who can take care of the pull to upstream.</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>When I'm done I delete the feature branch from my public repo</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><pre class="jive-pre"><code class="jive-code">$ git push origin :the-next-cool-thing
To git@github.com:jbosgi/jboss-as.git
- [deleted]         the-next-cool-thing
</code></pre><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>Generally I found that rebasing generates a lot of work especially when you have multiple feature branches and people building ontop of your work.</p><p style="min-height: 8pt; height: 8pt; padding: 0px;"> </p><p>May this be useful</p></div>
<div style="background-color: #f4f4f4; padding: 10px; margin-top: 20px;">
<p style="margin: 0;">Reply to this message by <a href="http://community.jboss.org/message/573577#573577">going to Community</a></p>
<p style="margin: 0;">Start a new discussion in JBoss AS7 Development at <a href="http://community.jboss.org/choose-container!input.jspa?contentType=1&containerType=14&container=2225">Community</a></p>
</div></td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>