Guys, I got this working with Scott's repo and this is now the subject of by pull request being cancelled, reason: I have all of Scott's changes - so im ahead of the uDig repo by leaps and bounds.
But instructions on how to play with others git repos is now here: http://udig.refractions.net/confluence/display/ADMIN/Contributing+changes -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Jody Garnett Sent: Wednesday, 17 August 2011 8:16 AM To: User-friendly Desktop Internet GIS Cc: User-friendly Desktop Internet GIS Subject: Re: [udig-devel] git branch fork collaboration how? That is how I work as well. Difference here is working with three remotes? I don't understand the difference :( On 17/08/2011, at 5:15 AM, andrea antonello <[email protected]> wrote: >> Okay I failed on this ... and eventually just made a clone of scott's >> repository. >> Scott has reported the issue to github; I am sure we are just doing >> something wrong. > > I am working in the mode you described before with the udig-platform. > I have it added to my personal clone as remote repo and fetch and pull > from it. If I want to commit some changes directly, I push back. > > Not sure what happened to you. > > Andrae > > > >> -- >> Jody Garnett >> >> On Tuesday, 16 August 2011 at 12:02 PM, Jody Garnett wrote: >> >> 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 >> >> > _______________________________________________ > User-friendly Desktop Internet GIS (uDig) > http://udig.refractions.net > http://lists.refractions.net/mailman/listinfo/udig-devel _______________________________________________ User-friendly Desktop Internet GIS (uDig) http://udig.refractions.net http://lists.refractions.net/mailman/listinfo/udig-devel 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. _______________________________________________ User-friendly Desktop Internet GIS (uDig) http://udig.refractions.net http://lists.refractions.net/mailman/listinfo/udig-devel
