Hi guys: 

I have been trying to sort out how to work with Scott on the tool palette. I 
came up with the following workflow:

1. Ask scotthendo to add you as a contributor to his private fork of 
udig-platform
2. Set up a tracked branch

git remote add scotthendo [email protected]:scotthendo/udig-platform.git
git fetch scotthendo
git branch --track scott scotthendo/master
git checkout scott


--- HOWEVER ---

It is not working for me .. if with a simple change to the basic README I git 
...

> git push
To [email protected]:scotthendo/udig-platform.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 
'[email protected]:scotthendo/udig-platform.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.


I have been stuck on this for a couple hours and could use a hand.
-- 
Jody Garnett

_______________________________________________
User-friendly Desktop Internet GIS (uDig)
http://udig.refractions.net
http://lists.refractions.net/mailman/listinfo/udig-devel

Reply via email to