I use `git rebase master` to put the branch's changes on top of the current version of master. You'll have to resolve conflicts just like with `git merge`. After you're finished, then use `git push --force-with-lease` to push your changes to your remote branch. (You might need to ask the repo administrator to grant you this permission, or push these changes to a new remote branch if that is not possible. The reason the permission might be denied is that force pushes rewrite history, so if two people are working on the same branch it can cause problems.)

Yes, when they assume that EVERYONE has a smartphone it is a big problem, as well as assuming that those who DO have smartphones know how to use QR codes. REQUIRING everyone to use a smartphone app is a huge burden on the elderly, even if they have smartphones.

I use regular expressions regularly. The downside is that it is difficult for newcomers to understand them. But as long as you add comments to your code it shouldn't be a problem. And many languages allow you to add comments WITHIN the regular expressions, making them even easier to understand. (I frequently create my regexes with comments in C# and then take out the comments afterwards, leaving the original version within commented-out code.)

Greenshot is good but lately I've just been using the built in screenshot capabilities of Windows 10 or 11. For creating animated GIFs I use ScreenToGif.