Hi, Curt, from my limited understanding of Git - you have painted yourself into a corner by having bare repo at one hand and creating situation where you need to merge on the other.
Possible immediate solutions I see - either clone the thumb repo to a new non-bare repo, add your master repo as a remote, do a merge and push from there - or add the thumb repo as a remote to an already existing non-bare repo, merge it and push to master In the future, you should make sure that you freeze the master repo, then pull to the thumb, pull to embedded, rebase embedded, commit, push from embedded to thumb, push from thumb to master, unfreeze master Oh, and make backups before you experiment, in case something b0rks :) Cheers, Edheldil ------------------------------------------------------------------------------ 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
