<br><br><div class="gmail_quote">On Tue, Jan 6, 2009 at 4:31 PM, Lydia Pintscher <span dir="ltr"><<a href="mailto:lydia@kde.org">lydia@kde.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
proxymailing for Jeff ;-)<br>
<div class="Ih2E3d"><br>
[...]</div><br>
This means that unless everyone shares a single GitHub account, it<br>
becomes very annoying to actually use this and pass branches back and<br>
forth. Here's what it really means:<br>
</blockquote><div><br>That's what Rails is doing. Check out <a href="http://www.github.com/rails/rails">http://www.github.com/rails/rails</a>. It is possible and allowed to do this.<br> </div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
1) If you want to have a branch tracking upstream, you have to add both<br>
the remote ref and the branch yourself, manually, on each computer to<br>
access your GitHub repo from. This branch also isn't synchronized with<br>
your GitHub account (unless you do it yourself).</blockquote><div><br>I don't what you mean. Say I forked Amarok from amarok/amarok into my own, Mange/amarok, and then clone it to my computer, this is what I should do:<br>
<ol><li>Run "git remote add upstream git@github.com:amarok/amarok.git" so I have the remote repo "upstream" defined</li><li>Commit changes to my repository as usual, and then</li><ol><li>Push to my own github account ("origin") for sync between my machines</li>
<li>Push to "upstream" when my changes are done and official</li></ol></ol>In newer versions of Git, the remote branches is automatically added as tracked branches now. If you need to create a <i>new</i> remote branch, then yes, the other developers will not get them automagically, but will have to add them themselves AFAIK. But as long as you have added upstream like above, it's as simple as "git checkout upstream/new-cool-feature" and bam!, it's there, checked out and tracked.<br>
<br>Creating a remote branch is about as simple as "git checkout -b even-cooler; git push origin even-cooler".<br><br>I think the PITA here comes from the fact that a lot of merging will have to be done in case J.Doe pushes to upstream and I have pushed changes to my origin AND I want a linear history when I merge to upstream myself. I can't (shouldn't) rebase my changes on top of J.Doe's changes since I have already pushed to my origin, which is a public repository.<br>
<br>Of course, the most practical way to use this would be to have just amarok/amarok with several developers committing to that. If you as a developer use multiple machines, then fork it, and never push from your own fork's repository to upstream, instead pull to upstream from your own fork in that case. We still get the good parts of github, which is that one-shot contributors can fork, commit, send pull requests and then get their patches in. GitHub even has a new web-UI for applying patches from other people into the repo, without even having to merge or anything, which can be mighty useful.<br>
<br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">[...]<br>
--Jeff<br>
<font color="#888888"><br>
--<br>
Lydia Pintscher<br>
Amarok community manager<br>
<a href="http://kde.org" target="_blank">kde.org</a> - <a href="http://amarok.kde.org" target="_blank">amarok.kde.org</a> - <a href="http://kubuntu.org" target="_blank">kubuntu.org</a><br>
<a href="http://claimid.com/nightrose" target="_blank">claimid.com/nightrose</a><br>
</font><div><div></div><div class="Wj3C7c">_______________________________________________<br>
Amarok-devel mailing list<br>
<a href="mailto:Amarok-devel@kde.org">Amarok-devel@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/amarok-devel" target="_blank">https://mail.kde.org/mailman/listinfo/amarok-devel</a><br>
</div></div></blockquote></div><br>GitHub is like any ordinary repo hosting server, anything you can do with your own bare-bones git hosting can be done on GitHub. It's their UI around all features that make people chose them.<br>
<br>But I could also just have missed all the points here. Perhaps Jeff could elaborate a bit for a naïve mind like mine own. :-)<br clear="all"><br>-- <br>Magnus Bergmark - magnus DOT bergmark AT gmail DOT com<br>GPG/PGP: 0x7BE84794DB6AA648<br>
Fingerprint: 0E6F D2DB F0EF 534A 2184 52AF 7BE8 4794 DB6A A648<br>