Log file Viewer

[20:10:38] <eamanu2> Hi everybody!

[20:10:57] <eamanu2> I am worlking on https://github.com/pypa/warehouse/pull/8323

[20:11:31] <eamanu2> and have conflicts on a .po file

[20:11:47] <eamanu2> what is your recomendation to fix it?

[20:12:16] <PSFSlack> <di> eamanu2: Hi! Thanks for working on that!

[20:13:04] <PSFSlack> <di> eamanu2: my recommendation would be to just overwrite any merge conflicts completely by running 'make translations' again after rebasing

[20:13:27] <PSFSlack> <di> eamanu2: running 'make translations' will always produce the right result as long as the codebase is up-to-date

[20:13:43] <eamanu2> ohh great thanks!

[20:14:29] <PSFSlack> <di> eamanu2: would you be able to provide a screenshot of the new message in the PR?

[20:16:12] <eamanu2> you mean that try to reproduce the change locally and send take the screenshot, right?

[20:31:22] <tos9> eamanu2: (oy, glad you just got sorted, your PRs been sitting in my inbox for a few days with me hoping I'd get some time to look at it and give you another pointer -- Julian)

[20:45:14] <PSFSlack> <di> eamanu2: yes, it makes it easier for maintainers to quickly review

[20:46:09] <eamanu2> hey tos9! not problem!

[20:46:50] <eamanu2> PSFSlack: ok I will make try to reproduce and put the screenshot. Thanks for your advice!

[20:48:03] <eamanu2> (this conflict has gone :) )