Great, thank you. I will be trying 'git pull --rebase origin master'
in the future. I feel better that there's some experts floating around
OSG that can help people with this sort of thing. Maybe if/when OSG
goes to Git, a wiki entry with a few approaches would be useful.
Bruce
On Feb 27, 2010, at 3:31 AM, Tim Moore wrote:
On Sat, Feb 27, 2010 at 3:21 AM, Bruce Wheaton
<[email protected]> wrote:
Not to blame the victim, but it sounds like some user error was
involved here. You should do your local work on branches, because it
is very easy to do so and makes it very easy to update to the main
sources if you need to. The "git rebase" workflow is perfect for the
occasional contributor.
Good to hear, however this is the first I've heard of the "git
rebase" workflow - sort of makes my point - not very friendly to non-
core users. I would have loved to find a guide to working with a
workflow with this, in fact, if you have one (please) I'll post it
elsewhere right away. Subversion took a few hours to start working
with, although of course, there's just stuff that's not even worth
trying to do.
Here a couple of links, in no particular order:
http://blog.woobling.org/2009/08/git-rebase-for-impatient.html
http://book.git-scm.com/4_rebasing.html
http://jarrodspillers.com/articles/git-merge-vs-git-rebase-avoiding-rebase-hell
(an alternate viewpoint :)
It has been a valid criticism that git can be hard to get into for a
novice, but I think the situation has changed as the community of
users grows outside of Linux kernel hackers.The git book listed
above, newbie documentiation at github.com, etc. are all part of
this positive trend.
Tim
_______________________________________________
osg-users mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
_______________________________________________
osg-users mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
