I think when you create a fork you are also "copying" all the branches. So you will have all your code there. Then you should do a merge between your brach (in your fork) and the master (also in your fork). Then you could perform a pull request.<div>
I'm not sure if this is correct. Let us wait for someone with more experience in git to correct me.</div><div><br></div><div>Best Regards, <br clear="all"><br>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX<br><br>Esteban Aliverti<br>
- Developer @ <a href="http://www.plugtree.com" target="_blank">http://www.plugtree.com </a><br>- Blog @ <a href="http://ilesteban.wordpress.com" target="_blank">http://ilesteban.wordpress.com</a><br>
<br><br><div class="gmail_quote">On Mon, Jan 31, 2011 at 10:58 AM, Leonardo Gomes <span dir="ltr"><<a href="mailto:leonardo.f.gomes@gmail.com">leonardo.f.gomes@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Hi Geoffrey,<br><br>Let me check if I understood the procedure:<br><br>1) You want us to fork: <a href="https://github.com/droolsjbpm/droolsjbpm" target="_blank">https://github.com/droolsjbpm/droolsjbpm</a><br><br>2) Then apply the changes that are in our forked branch (in my case, <a href="https://github.com/leogomes/droolsjbpm/tree/lr_unlinking_20101116" target="_blank">https://github.com/leogomes/droolsjbpm/tree/lr_unlinking_20101116</a>)<br>
to our forked main (<a href="https://github.com/leogomes/droolsjbpm" target="_blank">https://github.com/leogomes/droolsjbpm</a>) <br><br>3) Remove the branch<br><br>4) And, when we are done we the work on our fork, create a pull request to deliver the changes to the master.<br>
<br>That's it? If so, is there an easy way to do 2, other than generating a patch and applying it manually?<br><br>Thanks,<br><font color="#888888">Leonardo.</font><div><div></div><div class="h5"><br><br><br><br><div class="gmail_quote">
On Mon, Jan 24, 2011 at 3:52 PM, Leonardo Gomes <span dir="ltr"><<a href="mailto:leonardo.f.gomes@gmail.com" target="_blank">leonardo.f.gomes@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204, 204, 204);padding-left:1ex">Hi,<div><br></div><div>I'm planning to get rid of "<span style="font-family:arial,sans-serif;border-collapse:collapse">lr_unlinking_20101116" over the weekend. </span></div>
<div><span style="font-family:arial,sans-serif;border-collapse:collapse"><br></span></div><div><span style="font-family:arial,sans-serif;border-collapse:collapse">Cheers,</span></div>
<div><font face="arial, sans-serif"><span style="border-collapse:collapse">Leonardo.</span></font></div><div><div></div><div><div><br><div class="gmail_quote">On Thu, Jan 20, 2011 at 2:45 PM, Esteban Aliverti <span dir="ltr"><<a href="mailto:esteban.aliverti@gmail.com" target="_blank">esteban.aliverti@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204, 204, 204);padding-left:1ex"><span style="border-collapse:collapse;font-family:arial,sans-serif;font-size:13px">trunk_20100722_esteban_diega branch and tag are no longer among us :(</span><div>
<font face="arial, sans-serif"><span style="border-collapse:collapse">I have also deleted guvnor_expressionEditor3_baunax_esteban_20100202 tag</span></font></div><div><font face="arial, sans-serif"><span style="border-collapse:collapse"><br>
</span></font></div><div><font face="arial, sans-serif"><span style="border-collapse:collapse">Best Regards,<br clear="all"></span></font><br>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX<br><font color="#888888">
<br>Esteban Aliverti<br>- Developer @ <a href="http://www.plugtree.com" target="_blank">http://www.plugtree.com </a><br>- Blog @ <a href="http://ilesteban.wordpress.com" target="_blank">http://ilesteban.wordpress.com</a></font><div>
<div></div><div><br>
<br><br><div class="gmail_quote">On Thu, Jan 20, 2011 at 10:03 AM, Geoffrey De Smet <span dir="ltr"><<a href="mailto:ge0ffrey.spam@gmail.com" target="_blank">ge0ffrey.spam@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204, 204, 204);padding-left:1ex">
Hi guys,<br>
<br>
In the github reference repository<br>
<a href="https://github.com/droolsjbpm/droolsjbpm" target="_blank">https://github.com/droolsjbpm/droolsjbpm</a><br>
we have /release branches/, such as 4.0.x, 5,0.x, 5.1.x, 5.2.0.M1.x, ...<br>
which is fine,<br>
but also topic branches which clutter our reference repository.<br>
<br>
Following the conventions of other projects, we'd like to move all topic<br>
branches out of the github reference repository, by:<br>
<br>
* 1) Removing the topic branch if it has been merged into master<br>
long ago and has become irrelevant<br>
* 2) Keep the topic branch local (if it's short-lived) until it's<br>
merged into master<br>
* 3) Forking the reference repository on github and push your topic<br>
branches there, until it's merged into master<br>
o For example, edson's fork:<br>
<a href="https://github.com/etirelli/droolsjbpm" target="_blank">https://github.com/etirelli/droolsjbpm</a><br>
<br>
Here's a list of the topic branches that we want to get rid of.<br>
If one of them is yours, please read on.<br>
<br>
* Branch_4_0_2_SOA_4_2<br>
* DRLv6<br>
* DROOLS_4_0_2_SOA_4_2_GA<br>
* DroolsChance<br>
* K200<br>
* effective_dated<br>
* guvnor-pre-guided-changes-june-09<br>
* kstam_guvnor_modeshape<br>
* lr_unlinking_20101116<br>
* persistence_refactor<br>
* rete_using_static_methods_aug2009trunk_20100722_esteban_diega<br>
<br>
If 1) applies and it has been merged into master long ago and has become<br>
irrelevant, then just remove it with this command:<br>
$ git push origin :<branchname><br>
For example:<br>
$ git push origin :kstam_guvnor_modeshape<br>
<br>
If 2) or 3) applies, its a bit more difficult, but I'll make a blog in a<br>
few weeks on how to fork and do social coding.<br>
<br>
--<br>
With kind regards,<br>
Geoffrey De Smet<br>
<br>
<br>
_______________________________________________<br>
rules-dev mailing list<br>
<a href="mailto:rules-dev@lists.jboss.org" target="_blank">rules-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
</blockquote></div><br></div></div></div>
<br>_______________________________________________<br>
rules-dev mailing list<br>
<a href="mailto:rules-dev@lists.jboss.org" target="_blank">rules-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
<br></blockquote></div><br></div>
</div></div></blockquote></div><br>
</div></div><br>_______________________________________________<br>
rules-dev mailing list<br>
<a href="mailto:rules-dev@lists.jboss.org">rules-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/rules-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/rules-dev</a><br>
<br></blockquote></div><br></div>