Beginning to believe that doesn't want me contributing to #mastodon ā€” he's now partially recreated three of my pull requests that I've worked on.

My PRs didn't ship because I needed feedback from the team who were busy.

Like, I'm happy to spend the time and money to contribute to Mastodon, but it's horrifically rude to just redo someone's work when they've put a tonne of work into doing something.

He's also done this to me in the past in 2018 with the report management tools.

ćƒ•ć‚©ćƒ­ćƒ¼

If your PR addresses problems his PR won't, is it possible to restructure your PR in a way it improves things without causing conflict, on top of his changes? (It will probably be more work to do so, so if you don't want to do that, I think that's fair, though.)

Ā· Ā· Web Ā· 1 Ā· 0 Ā· 0

the conflicts would be so large and my work has existed well before his. I'm happy to take things back from his into mine or rebase the bits that I can, and I'd already offered that on the first instance of a conflicting PR, then he turned around and worked on an issue I'd literally told him that morning that I'd been working on & needed input from the team.

ćƒ­ć‚°ć‚¤ćƒ³ć—ć¦ä¼šč©±ć«å‚åŠ 
Fedibird

꧘怅ćŖē›®ēš„恫ä½æćˆć‚‹ć€ę—„ęœ¬ć®ę±Žē”Øćƒžć‚¹ćƒˆćƒ‰ćƒ³ć‚µćƒ¼ćƒćƒ¼ć§ć™ć€‚å®‰å®šć—ćŸåˆ©ē”Øē’°å¢ƒćØć€å¤šę•°ć®ē‹¬č‡Ŗę©Ÿčƒ½ć‚’ęä¾›ć—ć¦ć„ć¾ć™ć€‚