On 02/07/12 23:10, Justin Deoliveira wrote:
> Not 100% sure i get why we should not have one in the repo Ben?
Ended up writing a long-winded complaint (see my other email) that
turned into solving my problem and changing my mind. :-)
--
Ben Caradoc-Davies
Software Engineer
CSIRO Earth Science
Short version:
Adding ignores to .git/info/exclude allows me to supplement a .gitignore
under source control with the extra project-specific ignores I need, so
let us put the ignores everyone needs in .gitignore under source control.
Long version:
I see that Justin has already added a .gitigno
Thanks Justin - that's clear.
If I want to sync my fork with branches that are newly created in the
canonical repo I would do:
git fetch geotools # to get refs to new branches
git checkout new_branch_name
git push mbedward new_branch_name
Is that right ?
Aside: I don't think I yet fully compre
Hey Michael,
Again this is personal preference as there a few ways to do it (basically
how you want to organize your remotes) but when i want to update the
primary branches in my fork here is what i do:
% git checkout master
% git pull geotools master
% git push jdeolive master
% git checkout 8.
Hi Justin,
is there a recommended work-flow for keeping our developer forks in
sync with the canonical branches ?
Michael
On 3 July 2012 11:09, Justin Deoliveira wrote:
> Hi all,
>
> The 8.x branch has been cut.
>
> https://github.com/geotools/geotools/tree/8.x
>
> And along with it.
>
> h
Hi all,
The 8.x branch has been cut.
https://github.com/geotools/geotools/tree/8.x
And along with it.
https://github.com/geotools/geotools/tree/rel_8.x
I have also run through the paces of generating out the 8.0-RC2 release,
fixing issues that resulted from the git changeover along the way
Cool, I will cut the 8.x branch today and do the release. As described
recently there are still going to be some kinks to work out and in the
interest of not putting Victor through any more pain I will generate out
the artifacts myself.
For now i am going to assume the release model I described a
Just checked and my pull request has been merged in and a version of it
already released! How is that for fast turnaround :)
On Mon, Jul 2, 2012 at 12:02 AM, Ben Caradoc-Davies <
ben.caradoc-dav...@csiro.au> wrote:
> +1.
>
>
> On 01/07/12 04:04, Justin Deoliveira wrote:
>
>> Agreed... I think we
Hi Victor,
Sorry, but with the change over to git I think you are going to have some
more problems trying to release as I haven't done a run through of the
release scripts as of yet. So if i can i would ask you to hold off and i
will take the reigns back for this release. Sorry about the inconveni
I actually did add one when i setup the initial repo.
https://github.com/geotools/geotools/blob/master/.gitignore
Not 100% sure i get why we should not have one in the repo Ben?
On Mon, Jul 2, 2012 at 8:12 AM, David Winslow wrote:
> Git supports a user-specific .gitignore file - as described h
Git supports a user-specific .gitignore file - as described here:
https://help.github.com/articles/ignoring-files . It's additive - so both
ignore lists are considered when determining which files to ignore.
Would it make sense to commit a .gitignore for GeoTools with the things
that are produced
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,
FWIW I usually use "origin" for the common repository (in this case that
would be git://github.com/geotools/geotools.git) and refer to all others by
user name (including my own.)
--
David Winslow
OpenGeo - http://opengeo.org/
On Sat, Jun 30, 2012 at 12:07 PM, Justin Deoliveira wrote:
>
>
> On Sa
Then we will really need to add this to the instructions (or risk
target folders being committed)
--
Jody Garnett
On 02/07/2012, at 4:14 PM, Ben Caradoc-Davies
wrote:
> No, no, never commit .gitignore. Mine always starts with .gitignore :-)
>
> The advantage of a local-only .gitignore is that
14 matches
Mail list logo
