On Tuesday 02 October 2012 21:07:58 Curtis Olson wrote: > I have a clone of the repository on my embedded system too, and it's remote > is setup to point to the clone on the thumb drive when that is plugged in. > So I can plug the thumb drive into my main linux computer and run > pull/push against the master repository, or I can plug the thumb drive into > the embedded system and do pulls/pushes from the local embedded system with > the repository on the thumb drive acting as the remote master.
> > If I "cd" to the thumb drive repository and run git push (which I thought > would push my changes to the master repository) I get the following error: > > $ git push > To /path/myrepo.git/ > ! [rejected] master -> master (non-fast-forward) > Any suggestions? Having more than one bare repo probably won't work well. I would put a repository with working directory on the thumb drive. Now you can't push to this repo anymore, but you don't have to. Simply pull the changes from your embedded device to the thumb drive. Then you can push them to the master on your PC. Similarily you can pull changes from your master to the thumb drive and then pull the changes from the thumb to your embedded device. In other words, simply replace the embedded -> thumb push by a thumb <- embedded pull. Also remember that a git pull is just a git fetch followed by a git merge. Might help with the bare repo. Stefan
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
