The git reflog goes a long way in keeping you from permanently losing
things too:
http://gitready.com/intermediate/2009/02/09/reflog-your-safety-net.html
--
David Winslow
OpenGeo - http://opengeo.org/
On Sun, Jul 1, 2012 at 10:07 AM, Justin Deoliveira <jdeol...@opengeo.org>wrote:
>
>
> On Sun, Jul 1, 2012 at 2:53 AM, Michael Bedward <michael.bedw...@gmail.com
> > wrote:
>
>> On 1 July 2012 17:20, Andrea Aime <andrea.a...@geo-solutions.it> wrote:
>> >>> That is, how is one's fork kept in synch with the canonical one, I
>> guess
>> >>> it's not
>> >>> something automatic?
>>
>> Very pleased that you asked that question Andrea.
>>
>> >> And then to sync up my master to "upstream" I do:
>> >>
>> >> git pull upstream
>> >> git push
>> >
>> > Ah, I see, so this way your fork is always up to date (well, sort of,
>> but at
>> > least as often
>> > as you do the above).
>> >
>>
>> Is that because the push goes to both remotes ? I had the idea that
>> it didn't (need to read git books again).
>>
>> I'm pleased that I'm relatively inactive/lazy at the moment because I
>> feel increasingly anxious about stuffing things up with improper git
>> usage.
>>
>
> I can sympathize, and we are not being that good at making things simpler
> by describing one way to do things. Anyways, if you are worried about
> "screwing" up i recommend playing around with a few feature branche,
> pushing them to your developer fork, etc...
>
> At the end of the day git is pretty good about telling you when you have
> messed up and not allowing you to push changes that would muck up the
> repository. Really the only way you can truly screw up with git is by
> rewriting history (with a rebase) that is already public on a shared
> branch. And even if you do this if you try to push git will complain about
> not being able to merge and you would really have to force things with
> "--force" to have the push go through.
>
>>
>> Michael
>>
>>
>> ------------------------------------------------------------------------------
>> Live Security Virtual Conference
>> Exclusive live event will cover all the ways today's security and
>> threat landscape has changed and how IT managers can respond. Discussions
>> will include endpoint security, mobile security and the latest in malware
>> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
>> _______________________________________________
>> GeoTools-Devel mailing list
>> GeoTools-Devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/geotools-devel
>>
>
>
>
> --
> Justin Deoliveira
> OpenGeo - http://opengeo.org
> Enterprise support for open source geospatial.
>
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> GeoTools-Devel mailing list
> GeoTools-Devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/geotools-devel
>
>
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
GeoTools-Devel mailing list
GeoTools-Devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geotools-devel
