On Wed, May 11, 2011 at 2:27 AM, Thorsten wrote:
> > I then switch to master, do a
> >
> > git pull
> > git checkout local-weather
> > git rebase master
> >
> > Now the trouble starts...
>
Let me ask a dumb question then. I do a similar procedure to Thorsten,
except in my local branch I do a "git merge master" instead of a rebase.
Can someone explain the nuances of merge verses rebase?
Thanks,
Curt
--
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
