[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

Re: gEDA-user: getting along with git



On Wed, Apr 29, 2009 at 11:18:14PM +0000, Kai-Martin Knaak wrote:
> Just did one of my irregular updates of my local versions of geda and pcb 
> from git. For some reason "git pull" chokes on some misconfiguration. I 
> ended up recloning (again) and did a successful make. 

Not sure what happened, but you can recover with
'git reset --hard origin/before_pours'.  You can even just do 'git fetch;
git reset --hard origin/before_pours' to skip all merging/rebasing.

-- 
Ben Jackson AD7GD
<ben@xxxxxxx>
http://www.ben.com/


_______________________________________________
geda-user mailing list
geda-user@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-user