Opps, didn't send this to the list.

Fyi:

From: Jody Garnett
Sent: Monday, 29 August 2011 1:44 PM
To: John Hudson
Cc: [email protected]
Subject: Re: [Parkinfo-devel] Palette changes in uDig branch

ping!

(The assistance I need is emailing this stuff to udig-devel - so that others 
can tag along and review/approve our work).

Jody
On 24/08/2011, at 10:15 AM, John Hudson wrote:

I assume you have added the upstream remote (read the developer guide)

Then:

git fetch upstream
this will update your branch list

git branch -a
this will show you a list of all the remotes and things you have available 
should look something like:

$ git branch -a
  gef_palette
* master
  remotes/origin/1.1.x
  remotes/origin/1.2.x
  remotes/origin/HEAD -> origin/master
  remotes/origin/fpagnamenta
  remotes/origin/gef_palette
  remotes/origin/master
  remotes/scott/1.1.x
  remotes/scott/1.2.x
  remotes/scott/fpagnamenta
  remotes/scott/master
  remotes/upstream/1.1.x
  remotes/upstream/1.2.x
  remotes/upstream/fpagnamenta
  remotes/upstream/gef_palette
  remotes/upstream/master


(if you intend to work on master - fine too - skip the next step)

git checkout -b parkinfo
this is our parkinfo local branch - don't mistake this for a remote branch - 
local only

git merge remotes/origin/gef_palette
this gets up a working copy of the palette branch in our local repo

ping me if you need assistance.


________________________________
The contents of this email are confidential and may be subject to legal or 
professional privilege and copyright. No representation is made that this email 
is free of viruses or other defects. If you have received this communication in 
error, you may not copy or distribute any part of it or otherwise disclose its 
contents to anyone. Please advise the sender of your incorrect receipt of this 
correspondence.

________________________________
The contents of this email are confidential and may be subject to legal or 
professional privilege and copyright. No representation is made that this email 
is free of viruses or other defects. If you have received this communication in 
error, you may not copy or distribute any part of it or otherwise disclose its 
contents to anyone. Please advise the sender of your incorrect receipt of this 
correspondence.
_______________________________________________
Parkinfo-devel mailing list
[email protected]
http://lists.syd.ardec.com.au/mailman/listinfo/parkinfo-devel
_______________________________________________
User-friendly Desktop Internet GIS (uDig)
http://udig.refractions.net
http://lists.refractions.net/mailman/listinfo/udig-devel

Reply via email to