Errors and warnings when building 1.79 Master

For test results, bug reports, announcements of new builds etc.

Moderators: winston, another_commander, Getafix

another_commander
Quite Grand Sub-Admiral
Quite Grand Sub-Admiral
Posts: 6634
Joined: Wed Feb 28, 2007 7:54 am

Re: Errors and warnings when building 1.79 Master

Post by another_commander »

Gimi wrote:
Sorry AC. I jumped too quickly.
I'll try to backtrack and check what has been reported next time. These reports are quite incomprehensible to me, so I live by the rule, if in doubt, report it. I will accept a slap on the wrist for meddling too much though. :D
By all means, please continue to report any irregularities you see, even those you may be doubtful about. It's easy to miss something when dealing with half a million lines of code and any additional pairs of eyes watching are most welcome.
User avatar
Cody
Sharp Shooter Spam Assassin
Sharp Shooter Spam Assassin
Posts: 16081
Joined: Sat Jul 04, 2009 9:31 pm
Location: The Lizard's Claw
Contact:

Re: Errors and warnings when building 1.79 Master

Post by Cody »

Gimi wrote:
These reports are quite incomprehensible to me, so I live by the rule, if in doubt, report it.
<nods> Aye, me too.
I would advise stilts for the quagmires, and camels for the snowy hills
And any survivors, their debts I will certainly pay. There's always a way!
User avatar
Zieman
---- E L I T E ----
---- E L I T E ----
Posts: 680
Joined: Tue Sep 01, 2009 11:55 pm
Location: in maZe

Re: Errors and warnings when building 1.79 Master

Post by Zieman »

When trying to update an existing build:

Image
...and keep it under lightspeed!

Friendliest Meteor Police that side of Riedquat

[EliteWiki] Far Arm ships
[EliteWiki] Z-ships
[EliteWiki] Baakili Far Trader
[EliteWiki] Tin of SPAM
another_commander
Quite Grand Sub-Admiral
Quite Grand Sub-Admiral
Posts: 6634
Joined: Wed Feb 28, 2007 7:54 am

Re: Errors and warnings when building 1.79 Master

Post by another_commander »

Some of the changes you have made in src/Core/GameController.m will conflict with the update you are attempting. Execute git stash to discard all such changes and then git pull will work.
User avatar
Zieman
---- E L I T E ----
---- E L I T E ----
Posts: 680
Joined: Tue Sep 01, 2009 11:55 pm
Location: in maZe

Re: Errors and warnings when building 1.79 Master

Post by Zieman »

another_commander wrote:
Some of the changes you have made in src/Core/GameController.m will conflict with the update you are attempting. Execute git stash to discard all such changes and then git pull will work.
Ok, thanks.
...and keep it under lightspeed!

Friendliest Meteor Police that side of Riedquat

[EliteWiki] Far Arm ships
[EliteWiki] Z-ships
[EliteWiki] Baakili Far Trader
[EliteWiki] Tin of SPAM
Post Reply