Re: [Geotools-devel] git docs for transition

2012-07-04 Thread Martin Davis
Sure, I can work on that. On Wed, Jul 4, 2012 at 7:04 AM, Justin Deoliveira wrote: > Good idea Martin. Being someone who just went through the git learning > curve recently your take is a very valuable one. Any interest in adding > some content to that section? > > > On Tue, Jul 3, 2012 at 5:03 P

Re: [Geotools-devel] git docs for transition

2012-07-04 Thread Justin Deoliveira
Good idea Martin. Being someone who just went through the git learning curve recently your take is a very valuable one. Any interest in adding some content to that section? On Tue, Jul 3, 2012 at 5:03 PM, Martin Davis wrote: > Justin, it's good to have these different workflows explained (canoni

Re: [Geotools-devel] git docs for transition

2012-07-03 Thread Martin Davis
Justin, it's good to have these different workflows explained (canonical VS personal feature branch). Perhaps worth adding the feature branch workflow to the Git doc, under the Git Primer section? On Sat, Jun 30, 2012 at 12:55 PM, Justin Deoliveira wrote: > > That is, how is one's fork kept in s

Re: [Geotools-devel] git docs for transition

2012-07-02 Thread David Winslow
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 wrote: > > > On Sun, Jul 1, 2012 at 2:53 AM,

Re: [Geotools-devel] git docs for transition

2012-07-01 Thread Justin Deoliveira
On Sun, Jul 1, 2012 at 2:53 AM, Michael Bedward wrote: > On 1 July 2012 17:20, Andrea Aime 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 syn

Re: [Geotools-devel] git docs for transition

2012-07-01 Thread Justin Deoliveira
On Sun, Jul 1, 2012 at 1:20 AM, Andrea Aime wrote: > On Sun, Jul 1, 2012 at 6:41 AM, Jody Garnett 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 i

Re: [Geotools-devel] git docs for transition

2012-07-01 Thread Justin Deoliveira
On Sun, Jul 1, 2012 at 2:53 AM, Michael Bedward wrote: > On 1 July 2012 17:20, Andrea Aime 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 syn

Re: [Geotools-devel] git docs for transition

2012-07-01 Thread Michael Bedward
On 1 July 2012 17:20, Andrea Aime 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 >

Re: [Geotools-devel] git docs for transition

2012-07-01 Thread Andrea Aime
On Sun, Jul 1, 2012 at 6:41 AM, Jody Garnett 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 >

Re: [Geotools-devel] git docs for transition

2012-06-30 Thread Jody Garnett
> 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

Re: [Geotools-devel] git docs for transition

2012-06-30 Thread Justin Deoliveira
On Sat, Jun 30, 2012 at 1:36 PM, Andrea Aime wrote: > On Thu, Jun 28, 2012 at 7:20 PM, Justin Deoliveira > wrote: > >> Hey guys, >> >> I put together a first draft of a doc targeted at geotools committers. >> >> >> https://github.com/jdeolive/geotools/blob/gitdoc/docs/developer/procedures/git.rst

Re: [Geotools-devel] git docs for transition

2012-06-30 Thread Andrea Aime
On Thu, Jun 28, 2012 at 7:20 PM, Justin Deoliveira wrote: > Hey guys, > > I put together a first draft of a doc targeted at geotools committers. > > > https://github.com/jdeolive/geotools/blob/gitdoc/docs/developer/procedures/git.rst > > Highlights of the doc: > > * Describes how we structure and

Re: [Geotools-devel] git docs for transition

2012-06-28 Thread Jody Garnett
Well once your page is merged in, I will point uDig developers there. > Cool, some good stuff in there. I guess we don't need the svn stuff anymore. > With this git knowledge nirvana going on we should consolidate a bit... or we > risk just doing more damage than good and confusing folks with mu

Re: [Geotools-devel] git docs for transition

2012-06-28 Thread Justin Deoliveira
On Thu, Jun 28, 2012 at 8:36 PM, Jody Garnett wrote: > I put together a first draft of a doc targeted at geotools committers. > > > https://github.com/jdeolive/geotools/blob/gitdoc/docs/developer/procedures/git.rst > > That looks great Justin - and it is nice being able to review the RST file > ri

Re: [Geotools-devel] git docs for transition

2012-06-28 Thread Justin Deoliveira
Hey Michael, Generally the ssh protocol (git@). I will remove the ambiguity in the working with git doc. However there are a number of ways you can do this, it actually doesn't matter since you can simply change the remote urls in your local copy after you clone it. Generally what I would do

Re: [Geotools-devel] git docs for transition

2012-06-28 Thread Jody Garnett
> I put together a first draft of a doc targeted at geotools committers. > > > https://github.com/jdeolive/geotools/blob/gitdoc/docs/developer/procedures/git.rst That looks great Justin - and it is nice being able to review the RST file right in github. > Highlights of the doc: > > * Desc

Re: [Geotools-devel] git docs for transition

2012-06-28 Thread Michael Bedward
Many thanks for these docs Justin - they are very helpful. Should we be using the https or ssh protocols to clone the repo or doesn't it matter ? Both are shown in the clone examples on the 'Working with Git' page. Michael On 29 June 2012 06:06, Justin Deoliveira wrote: > And more, some updat

Re: [Geotools-devel] git docs for transition

2012-06-28 Thread Justin Deoliveira
And more, some updates to the user guide: https://github.com/jdeolive/geotools/blob/gitdoc/docs/user/advanced/build/source.rst https://github.com/jdeolive/geotools/blob/gitdoc/docs/user/advanced/build/git.rst The second doc has a bit of overlap with the one in the developer guide. We could pote

[Geotools-devel] git docs for transition

2012-06-28 Thread Justin Deoliveira
Hey guys, I put together a first draft of a doc targeted at geotools committers. https://github.com/jdeolive/geotools/blob/gitdoc/docs/developer/procedures/git.rst Highlights of the doc: * Describes how we structure and manage our repositories, canonical, developer forks, etc... * Provides a