Re: [Flightgear-devel] another git question

2012-10-04 Thread Curtis Olson
Thanks again everyone for the great feedback. I was completely unaware of the git bundle mechanism. That actually seems like it is the simplest and most straight forward. It allows pretty typical work flow with just an alternative mechanism for handling the network parts. The only tricky thing

Re: [Flightgear-devel] another git question

2012-10-04 Thread Roland Haeder
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 10/04/2012 05:58 PM, Curtis Olson wrote: Thanks again everyone for the great feedback. I was completely unaware of the git bundle mechanism. That actually seems like it is the simplest and most straight forward. It allows pretty typical work

Re: [Flightgear-devel] another git question

2012-10-03 Thread Edheldil
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

[Flightgear-devel] another git question

2012-10-02 Thread Curtis Olson
I know how everyone loves git questions here, so this is a bit off topic, but I have another crazy git question. The situation is probably weird enough that I might not be able to explain it well enough to get an answer, but let me try. The situation is that I have a master git repository on my