"Changes can be cleanly merged" — it says at the same time.
comments
I don’t get how this is software gore? It’s a merge conflict, a kind of common thing in Git.
Would really prefer they didn't have these buttons, if they're not implemented correctly. Similarly, there's a setting to uses rebases throughout the UI instead of merge commits. And it works everywhere, except when updating PR branch. It has a button "Update branch", which does the wrong thing, with a dropdown where you can select "Rebase branch" instead. So many times, I've had to tell people to not click that button...
yeah, I've seen this bs multiple times now. Also tired of github rewriting commits and changing hashes when they can just be fastforwrded onto the merging branch. So for a while now I almost exclusively use the command line to merge.
Nix 🥰
Try full-upgrade and see if it shows any?
The only difference between upgrade and full-upgrade is that full-upgrade will remove packages if necessary (like if an installed package conflicts with an update), whereas upgrade won't.
Sounds like your install is old enough where it doesn't qualify for the updates. You get like 5 or 6 ESM keys for free i think.
smooth criminal
Possible that you were pending a kernel update before the reboot, and the system was ineligible to those security updates at that moment.
Dell's bots give you the runaround and even have fake Indian names and ask you to answer the most stupid questions and do utterly idiotic diagnostic procedures. I guess you are meant to think its an outsourced human agent that's just really stupid but they don't want you to have a bad impression of India.
I've had a bot end the session while both I and the service agent were typing, and it was only 30 seconds since the last message.
This happened 3 times in a row before I learnt to pre-type all my answers in a text document and copy-paste them to keep the not happy.
I was recently less than amused, when I first waited for a response for 8 minutes, and then an agent asked something, required immediate answer and ended the chat in 30 seconds
Oh outlook. I love the multifactor authentication prompt to open my outlook app to verify the secret number... when I'm trying to log into the outlook app...
- abusing markdown formatting to make it look silly
I'd love if you posted it here :)
I prefer Windows 10 and Linux. Seriously!
I saw a similar post earlier but with notepad.
Windows is cool
Not in 2023, but this one has the exact same score: https://nvd.nist.gov/vuln/detail/CVE-2020-17541
I'm not sure they've had bugs as severe as CVE-2023-4863 though?
Links to two years ago. Surely jpg png or bmp parsers had security issues whatever years ago as well?
including Electron-based applications such as 1Password and Signal.
Electron is affected by almost every vulnerability. 🙄
Huh, it's not like there are any security issues with it...
You can’t have a joint credit card account. It has to be in one person’s name.
I've had exactly the same problem a while ago with Barclaycard, had to phone them.