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
skip the
Of late, I have increasingly been running into some segfaults which seem to
have to do with peak memory usage (I don't think memory leaks are a major issue
for what I've been seeing, since some segfauls happened quite early on, and
especially when I try pushing my limits of graphical goodies).
On Thu, Aug 9, 2012 at 10:06 AM, Renk Thorsten wrote:
Both options, random buildings and a realistic view range, are in my view
extremely cool as long as you know what you are doing with them, and I don't
really want to abandon either. But I suspect their combination (combined with
other
Hello,
So far, so good! Thanks!
The only issue I found is that the visibility can't be changed in any way.
Heiko
still in work: http://www.hoerbird.net/galerie.html
But already done: http://www.hoerbird.net/reisen.html
Arnt Karlsen a...@c2i.net writes:
On Wed, 08 Aug 2012 16:19:07 +0700, Ivan wrote:
Arnt Karlsen a...@c2i.net writes:
On Mon, 06 Aug 2012 10:33:19 +0700, Ivan wrote:
[…]
I'm glad it works for you (personally, I haven't managed to get any
use of machine translation),
..kay 8o)
It looks like every time you rebase you have to reapply the same set of
patches over top the target branch. So even if I figure out a way through
it once, I'll have to repeat the same conconction of craziness each time I
rebase. I think I'm going to create a new branch, untar my changes on top,
On Thu, 9 Aug 2012, Curtis Olson wrote:
It looks like every time you rebase you have to reapply the same set of
patches over top the target branch. So even if I figure out a way through
it once, I'll have to repeat the same conconction of craziness each time I
rebase. I think I'm going to
On Thu, Aug 9, 2012 at 10:44 AM, Anders Gidenstam
anders-...@gidenstam.orgwrote:
If you can figure out which commits cause the problems you can edit them
out of your branch (or, better, out of a copy of it) using
git rebase -i HEAD~42
(change 42 to the number of commits back from HEAD that
On 08/09/2012 07:45 AM, Curtis Olson wrote:
It looks like every time you rebase you have to reapply the same set of
patches over top the target branch.
Not true in general. I've never had a problem like that.
So even if I figure out a way through
it once, I'll have to repeat the same
Hi all,
Just to let you know that the 3D models import webform in now in early
production. The first 3D models (both static and shared) imported for test have
been correctly shipped downwards by Terrasync.
A big thank to Martin, Julien, Clément for their help and support.
I hope you enjoy
Thanks to all involved for all your hard work on this!!! I'm busy right
now updating new scenery chunks that include Martin's recent duplicate
object clean up. But everyone can get things quicker themselves via
terrasync (or running svn manually to keep their scenery tree in sync.)
Curt.
On
On Thu, Aug 9, 2012 at 2:45 PM, Curtis Olson curtol...@gmail.com wrote:
It looks like every time you rebase you have to reapply the same set of
patches over top the target branch. So even if I figure out a way through
it once, I'll have to repeat the same conconction of craziness each time I
On Thu, Aug 9, 2012 at 11:50 AM, Tim Moore wrote:
If you are going to keep a branch for a long time that you are not
merging back into e.g., master, there are a couple of possibilities.
One is to merge (pull) master into your branch. Another is to check
out git-rerere (I kid you not), which
Hi,
I can not leave this thread like this ;=((
I have NOT followed what your PARTICULAR problem is,
but decided to do a 'quick' 2.9 build from source, using
existing binaries, and found NO PROBLEMS... total build
time approximately 3-4 hours...
I AGREE the directory setup SUCKS big time, and
On Thu, 9 Aug 2012, Geoff McLane wrote:
I AGREE the directory setup SUCKS big time, and the wiki
does not yet give ALL the answers... and this, at the moment
seem exacerbated by some Win32 parts of jenkins
(simpits) seem DOWN...
Should be back online tonight! :)
g.
--
Proud owner of F-15C
Hi,
I sent model updates to fgf...@stockill.org a while ago. Is there any chance
they will be inserted in the database ?
My model is made of 3 xml, 3 .ac and 2 textures . How can I submit it ?
Regards,
-Fred
- Mail original -
De: Olivier acom...@yahoo.com
À: FlightGear
On Thu, Aug 9, 2012 at 3:07 PM, Heiko Schulz wrote:
The only issue I found is that the visibility can't be changed in any way.
Good spot. This is now fixed.
Stuart Buchanan wrote:
1) Local Weather has its own wind definitions for scenarios
that aren't METAR-based, so you still need to use
Frederic Bouvier wrote:
My model is made of 3 xml, 3 .ac and 2 textures . How can I submit it ?
Sounds like it should be submitted as three distinct models.
Cheers,
Martin.
--
Unix _IS_ user friendly - it's just selective about who its friends are !
On Thu, Aug 9, 2012 at 10:46 AM, Stuart Buchanan wrote:
On Thu, Aug 9, 2012 at 10:06 AM, Renk Thorsten wrote:
Both options, random buildings and a realistic view range, are in my view
extremely cool as long as you know what you are doing with them, and I don't
really want to abandon either.
Frederic Bouvier wrote:
My model is made of 3 xml, 3 .ac and 2 textures . How can I submit
it ?
Sounds like it should be submitted as three distinct models.
It can't : it's one bridge and it's light volumes. Our format supports
submodels, you know ?
-Fred
Hi All,
I've just committed a new dialog - Environment Settings, which is
intended to contain environment settings that aren't part of the
weather settings, but shouldn't be in the rendering dialog either.
At the moment it allows users to configure the season (move from the
Rendering dialog),
21 matches
Mail list logo
