On Sun, Jul 1, 2012 at 1:20 AM, Andrea Aime <andrea.a...@geo-solutions.it>wrote:
> On Sun, Jul 1, 2012 at 6:41 AM, Jody Garnett <jody.garn...@gmail.com>wrote:
>
>> Read it, looks good but I do have questions about pushing.
>> Say I work off my fork, and then push to canonical... I guess I will have
>> to push to
>> my fork as well?
>> That is, how is one's fork kept in synch with the canonical one, I guess
>> it's not
>> something automatic?
>>
>> Sorry for the silly question, mostly used to work on git against the
>> canonical only,
>> and with svn basically doing the same (minus a lot of local branches)
>>
>> I take a different track then justin, I register "upstream" as a remote
>> pointing to the main geotools repository.
>>
>> 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).
>
> Seems simpler... any downsides?
>
> I believe what Jody describing is exactly the same thing except for that
he calls the remote to canonical "upstream" and with git push somehow his
configuration uses origin as the "default" remote. As well he is relying on
the default behaviour of pulling/pushing the current branch you are on.
Which I avoid because it is too easy to forgot you are on a feature branch
push up a feature branch you don't want to push.
In the end its totally personal preference.
Cheers
> Andrea
>
>
> --
> Ing. Andrea Aime
> GeoSolutions S.A.S.
> Tech lead
>
> Via Poggio alle Viti 1187
> 55054 Massarosa (LU)
> Italy
>
> phone: +39 0584 962313
> fax: +39 0584 962313
> mob: +39 339 8844549
>
> http://www.geo-solutions.it
> http://geo-solutions.blogspot.com/
> http://www.youtube.com/user/GeoSolutionsIT
> http://www.linkedin.com/in/andreaaime
> http://twitter.com/geowolf
>
>
--
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
