> The typical fix is to edit the conflicting files and "git add" them the run
> "git rebase --continue".
> But these files don't exist so I can't edit them, git add fails, git rm also
> fails since they don't exist.
If the files no longer exist, I think one solution is to tell the system to
s
No way.
I brougth from http://flightgear.simpits.org:8080/ everything but FG
source, so I put the source(2.9.0) into thedirectory structure to
build with Cmake and MSVC10 and NO way, same errors.
Thanks folks for your support, I give up.
2012/8/8 M. Carbax :
> Thanks Fred, I'll try my last
On Wed, 08 Aug 2012 16:19:07 +0700, Ivan wrote in message
<86a9y5lp10@gray.siamics.net>:
> > Arnt Karlsen writes:
> > On Mon, 06 Aug 2012 10:33:19 +0700, Ivan wrote:
>
> […]
>
> >> Here in Russia, a few teams have decided that we may benefit from
> >> including short notes on var
On Wed, Aug 8, 2012 at 12:06 PM, Tim Moore wrote:
> It sounds like your local tree has not been completely committed. See
> what "git status" says. Check out the man page for git-mv. I can't say
> more right at the moment, but I'll see if I can add more details
> later.
>
There are a couple other
It sounds like your local tree has not been completely committed. See
what "git status" says. Check out the man page for git-mv. I can't say
more right at the moment, but I'll see if I can add more details
later.
Tim
On Wed, Aug 8, 2012 at 5:45 PM, Curtis Olson wrote:
> A quick update here. Rob
Thanks Fred, I'll try my last chance :(
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will
On Wed, Aug 8, 2012 at 10:45 AM, Curtis Olson wrote:
> A quick update here. Rob pointed out the "git rebase --abort" command
> which got me back to a sensible working state. I was able to reevaluate my
> original problem which turned out to be a simple merge conflict in my
> branch vs. changes
A quick update here. Rob pointed out the "git rebase --abort" command
which got me back to a sensible working state. I was able to reevaluate my
original problem which turned out to be a simple merge conflict in my
branch vs. changes in "master" and I was able to fix that and successfully
merge -
It may be an OSG library error. If you already have OSG installed on your
computer Cmake may be detecting this instead of the one that you think that
you are using if you are following the instructions at
http://wiki.flightgear.org/Building_using_CMake_-_Windows.
Look at the Cmake screen after
I mean: 2.8.0 rc4 *binaries* are out.
I doubt that you manage to compile from sources 2.8 if you can't for 2.9
Regards,
-Fred
- Mail original -
> De: "M. Carbax"
> À: "FlightGear developers discussions"
>
> Envoyé: Mercredi 8 Août 2012 17:17:26
> Objet: Re: [Flightgear-devel] Error bui
Thanks Frederic:
I tryed before 2.8.0 and 2.6.0, and the problem is the same: smething
realted with simgear lib and unresolved external symbols.
I don't know what I'm doing wrong, thanks,
2012/8/8 Frederic Bouvier :
>>
>> Hi Alan:
>>
>> Once more, thanks for trying to help, but there is no wa
>
> Hi Alan:
>
> Once more, thanks for trying to help, but there is no way: I tried SG
> $ FG 2.9.0, I followed the document, but the errors still appear: I
> give up :(
>
> I think that 10 days is enough.
You have 2.8.0 rc4 if you can't wait
---
Hi Alan:
Once more, thanks for trying to help, but there is no way: I tried SG
$ FG 2.9.0, I followed the document, but the errors still appear: I
give up :(
I think that 10 days is enough.
Thanks,
--
Live Security Virt
I've run into a problem with git and I seem to hit a dead end no matter
which way I turn. I'm hoping this is something easy to solve, but the
details might be complicated to communicate? I'll try to start simple --
I'm working with the fgdata repository. I created my own branch and have
been tra
> Arnt Karlsen writes:
> On Mon, 06 Aug 2012 10:33:19 +0700, Ivan wrote:
[…]
>> Here in Russia, a few teams have decided that we may benefit from
>> including short notes on various free software packages into our
>> “Join us on SFD 2012!” flyers, and FlightGear was one of such
>> pa
15 matches
Mail list logo
