On Thu, 2009-11-05 at 16:59 -0500, DJ Delorie wrote: > Why can't I update from your tree? Something like this happens every > time, and I end up deleting the whole tree and cloning from scratch.
Because it is a stgit branch, when I edit my code - history in the repository changes, so the usual "git pull" or whatever will fail. It should be possible to update with something like: git fetch git reset --hard origin/local_customisation_no_pours (throwing away local changes) git rebase (I don't think) takes kindly to history being changed underneath. stgit patch series will rebase fine, as it uses a somewhat different mechanism IIRC. _______________________________________________ geda-user mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-user
