03:25:00 <luigi1111> .merges
03:25:00 -xmr-pr- 7852 8203 8396 8488 8920 9064 9149 9151 9194 9198 9199 9200 9202 9204 9205 9211 9232 9245 9252 9254 9257 9259 9260 9267 9268 9270 9282 9291 9292 9305 9306 9307 9309 9310 9311 9313 9316 9323
05:10:57 <luigi1111> .merges
05:10:57 -xmr-pr- 8203 9202 9252
05:11:00 <luigi1111> some conflicts
08:02:27 <tobtoht_> luigi1111: fixed 9202 conflict
12:41:54 <selsta> UkoeHB: can you take a look at master branch? something multisig related is failing build
12:42:03 <selsta> https://github.com/monero-project/monero/actions/runs/9168957983/job/25208590621
13:02:01 <selsta> it appears to be related to https://github.com/monero-project/monero/pull/7852, not sure what happened. likely because the PR was old, the master branch changed and some further changes are necessary
15:13:20 <selsta> luigi1111: can you delete this branch? https://github.com/monero-project/monero/tree/bump-copyright-year we will do it differently, seems using a bot has some downsides
15:19:59 <jerfo> .merges
15:19:59 -xmr-pr- 8203 9202 9252
15:46:49 <luigi1111> ok
17:23:51 <selsta> can someone review so that we can fix build? https://github.com/monero-project/monero/pull/9339
17:34:39 <rbrunner> Was that an artifact from a rebase or merge?
17:35:02 <selsta> the PR was quite old so master branch was changed in the meantime to use ms_status struct
17:35:32 <rbrunner> Ok
17:35:38 <selsta> I guess it makes sense to to re-run CI first before merging really old PRs
17:35:43 <selsta> .merge+ 9339
17:35:43 <xmr-pr> Added
18:54:14 <UkoeHB> selsta: sorry about that, thanks for fixing it!
19:23:51 <selsta> .merge+ 9338
19:23:51 <xmr-pr> Added
19:23:53 <selsta> .merges
19:23:53 -xmr-pr- 8203 9202 9252 9338 9339
19:24:16 <selsta> .merge- 9252
19:24:16 <xmr-pr> Removed
19:52:36 <tobtoht_> thanks for merges
20:03:18 <nioCat> .merges
20:03:18 -xmr-pr- 8203 9338