[19:27:31] <qdb>	 i am trying to continue https://gerrit.wikimedia.org/r/#/c/164049/ development after long time. (scripts converter for tatar language). git pull could not complete all files. i cannot send its output. now, i have:
[19:27:39] <qdb>	 git status output: ... modified:   thumb.php Unmerged paths: (use "git add <file>..." to mark resolution) both modified:   autoload.php both modified:   includes/language/LanguageConverter.php It took 7.00 seconds to enumerate untracked files. 'status -uno' may speed it up, but you have to be careful not to forget to add new files yourself
[19:27:40] <qdb>	 (see 'git help status').
[19:27:46] <qdb>	 git pull output: error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.
[19:27:52] <qdb>	 composer update --no-dev output: > ComposerHookHandler::onPreUpdate PHP Parse error:  syntax error, unexpected '<<' (T_SL), expecting ']' in /var/www/html/mediawiki/autoload.php on line 729 Parse error: syntax error, unexpected '<<' (T_SL), expecting ']' in /var/www/html/mediawiki/autoload.php on line 72
[19:29:26] <qdb>	 as i know git clone will download all data again. i would like to find more elegant solution. if there are some new local changes, i do not remember them , i think they are not important, i am ready to lose them.
[19:30:49] <Nikerabbit>	 git reset --hard origin/master (or whatever branch you are using)
[19:42:56] <qdb>	 Nikerabbit i runned it, seems it worked.
[19:43:03] <qdb>	 now, "composer update --no-dev" output :  > ComposerHookHandler::onPreUpdate Loading composer repositories with package information Warning from https://repo.packagist.org: Support for Composer 1 is deprecated and some packages will not be available. You should upgrade to Composer 2. See https://blog.packagist.com/deprecating-composer-1-support/
[19:43:03] <qdb>	 Info from https://repo.packagist.org: #StandWithUkraine Updating dependencies Your requirements could not be resolved to an installable set of packages. Problem 1 ... Problem 8 ... Running update with --no-dev does not mean require-dev is ignored, it just means the packages will not be installed. If dev requirements are blocking the update you have
[19:43:04] <qdb>	 to resolve those problems.
[19:44:05] <qdb>	 consider adding this git /gerrit use cases / problems in https://www.mediawiki.org/wiki/Gerrit/Tutorial ...
[19:48:58] <qdb>	 i think i will search for answers tomorrow in chat logs
[21:12:32] <legoktm>	 qdb: can you pastebin the full output from composer?
[21:12:49] <legoktm>	 Also, my blog post made it in https://this-week-in-rust.org/blog/2022/12/28/this-week-in-rust-475/
[21:19:23] <Izno>	 nice
[21:19:30] <Izno>	 :crab: