Zero-K talk:Developing
Steel_Blue says:
Developing#Updating_sources contains a link that describes how to use the github website to pull recent changes into your fork repository with a merge commit. When I did it my repo de-synced from ZeroK-RTS master making a whole bunch of separate commits by me authored by someone else. When I tried to pull request some changes it resulted in this https://github.com/ZeroK-RTS/Zero-K/pull/3688 where my changes were on top of 400 commits separate from what master was. It would be best to re-write this section to be more clear. For referance, I had bare bones knowlege on how to use git and I've never worked with forks before.
Professional TIp
if you do ---~~~~ it will become --Shaman (talk) 02:25, 16 August 2019 (CEST)
Debug data:
[SQLBagOStuff] MainObjectStash using store ReplicatedBagOStuff[objectcache] MainWANObjectCache using store EmptyBagOStuffIP: 216.73.216.157Start request GET /mediawiki/index.php?oldid=5599&printable=yes&title=Zero-K_talk%3ADeveloping
HTTP HEADERS:
CONTENT-TYPE:
CONTENT-LENGTH: 0
USER-AGENT: Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)
HOST: zero-k.info
ACCEPT-ENCODING: gzip, br, zstd, deflate
ACCEPT: */*
CONNECTION: close[localisation] LocalisationCache: using store LCStoreDB[session] SessionManager using store SqlBagOStuff[DBReplication] Cannot use ChronologyProtector with EmptyBagOStuff[DBReplication] Wikimedia\Rdbms\LBFactory::getChronologyProtector: request info {
"IPAddress": "216.73.216.157",
"UserAgent": "Mozilla\/5.0 AppleWebKit\/537.36 (KHTML, like Gecko; compatible; ClaudeBot\/1.0; +claudebot@anthropic.com)",
"ChronologyProtection": false,
"ChronologyPositionIndex": 0,
"ChronologyClientId": false
}[DBConnection] Wikimedia\Rdbms\LoadBalancer::lazyLoadReplicationPositions: executed chronology callback.[DBConnection] Wikimedia\Rdbms\LoadBalancer::getLocalConnection: connected to database 0 at 'localhost'.[SQLBagOStuff] Connection mysql object #127 (handle id #121) will be used for SqlBagOStuff[session] SessionBackend "6udpo32kibi4fug5lrsugqv8ppf0mi9d" is unsaved, marking dirty in constructor[session] SessionBackend "6udpo32kibi4fug5lrsugqv8ppf0mi9d" save: dataDirty=1 metaDirty=1 forcePersist=0[cookie] already deleted setcookie: "wikidb229_mw__session", "", "1721657671", "/", "", "", "1"[cookie] already deleted setcookie: "wikidb229_mw_UserID", "", "1721657671", "/", "", "", "1"[cookie] already deleted setcookie: "wikidb229_mw_Token", "", "1721657671", "/", "", "", "1"[cookie] already deleted setcookie: "forceHTTPS", "", "1721657671", "/", "", "", "1"[DBConnection] Wikimedia\Rdbms\LoadBalancer::getLocalConnection: connected to database 0 at 'localhost'.[localisation] LocalisationCache::isExpired(en): cache for en expired due to GlobalDependency[localisation] LocalisationCache::recache: got localisation for en from source[DBQuery] startAtomic: entering level 0 (LCStoreDB::finishWrite)[DBQuery] endAtomic: leaving level 0 (LCStoreDB::finishWrite)Title::getRestrictionTypes: applicable restrictions to [[Zero-K talk:Developing]] are {edit,move}[objectcache] Rejected set() for global:revision-row-1.29:wikidb229-mw_:1152:5600 due to pending writes.[objectcache] Rejected set() for global:NameTableSqlStore:slot_roles:wikidb229-mw_ due to pending writes.[objectcache] Rejected set() for global:NameTableSqlStore:content_models:wikidb229-mw_ due to pending writes.[ContentHandler] Created handler for wikitext: WikitextContentHandler[MessageCache] MessageCache using store SqlBagOStuff[SQLBagOStuff] Connection mysql object #127 (handle id #121) will be used for SqlBagOStuff[SQLBagOStuff] Connection mysql object #127 (handle id #121) will be used for SqlBagOStuff[SQLBagOStuff] Connection mysql object #127 (handle id #121) will be used for SqlBagOStuff[SQLBagOStuff] Connection mysql object #127 (handle id #121) will be used for SqlBagOStuff[DBQuery] Wikimedia\Rdbms\DatabaseMysqlBase::lock failed to acquire lock 'wikidb229-mw_:messages:en'[SQLBagOStuff] SqlBagOStuff::lock failed due to timeout for wikidb229-mw_:messages:en.[MessageCache] MessageCache::load: Loading en... local cache is empty, global cache is expired/volatile, loading from database, could not acquire main lock, using stale cacheParserFactory: using preprocessor: Preprocessor_HashUnstubbing $wgLang on call of $wgLang::_unstub from ParserOptions->__construct[caches] parser: SqlBagOStuffArticle::view using parser cache: noArticle::view: doing uncached parse[SQLBagOStuff] Connection mysql object #127 (handle id #121) will be used for SqlBagOStuff[SQLBagOStuff] Connection mysql object #127 (handle id #121) will be used for SqlBagOStuffParser cache options found.[DBPerformance] Sub-optimal transaction on DB(s) [localhost (wikidb229-mw_) (TRX#9c5297)]:
0 5.342786 query-m: DELETE FROM `mw_l10n_cache` WHERE lc_lang = 'X' [TRX#9c5297]
1 0.002957 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
2 0.003114 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
3 0.003854 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
4 0.002818 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
5 0.004733 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
6 0.002760 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
7 0.003236 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
8 0.002854 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
9 0.002719 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
10 0.002725 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
11 0.002706 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
12 0.002760 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
13 0.003381 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
14 0.003094 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
15 0.004163 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]
16 0.004406 query-m: INSERT INTO `mw_l10n_cache` (lc_lang,lc_key,lc_value) VALUES ('X') [TRX#9c5297]MediaWiki::preOutputCommit: primary transaction round committedMediaWiki::preOutputCommit: pre-send deferred updates completedMediaWiki::preOutputCommit: session changes committedMediaWiki::preOutputCommit: LBFactory shutdown completedTitle::getRestrictionTypes: applicable restrictions to [[Zero-K talk:Developing]] are {edit,move}
