If they don't know how to solve conflicts do you think that they know the difference between merge or rebase?
You pull the origin to your fork and solve the conflicts one by one, that's usually how it goes.
If you want to keep your files how they are you can select "accept local changes" instead of "accept incoming changes". That's it.
Edit: If you need something more detailed let me know, I am assuming you are using an IDE like VSCode
Bitcoin educator lmao
[ x ] I am in this picture and I don't like it
I don't know why he has so many followers. I think it is just because he says what people want to hear, but it doesn't have any depth to it.
Nothing against him personally, I just think he's annoying and also has some entrepreneur vibes that I hate. I am grateful for the right to repair activism, but the latest videos that I watched were just shallow complaining. Justified of course but... yeah.
This is one thing I noticed as well. I only have my Instagram profile to check on others but whenever the algorithm feeds me something it is always cute animals.
I've had ant infestations in my bedroom window. I understand completely how you feel, it is awful indeed.
Isn't there a way to allow the devices to be accessed through the local network? It doesn't need to interfere with the data collection or the encryption, you are just allowing the user to access the device locally, before it is even encrypted to be sent to the servers.
To be honest if I am choosing between two devices and one supports HA and the other doesn't, the choice is quite obvious. I think one way to convince your higher ups is that you will be more appealing to a big niche of tech users that have elaborate IOT setups (which means $$$).
If it was intended but not properly documented as it says, why does it keep being called a bug?
What about D4 last update? I haven't played it but I heard a lot of people saying they fixed a lot of the issues with the game.
Imagine having the guts of using a command with "--purge" without reading documentation and blaming others because you're just lazy.
Maybe just install a distro that don't let you do that, OP. Have you considered getting a Mac?
Sometimes I have doubts if some people I see posting here on Lemmy actually work. It seems like y'all live in this Wonderland where finding new jobs is extremely easy and convincing whole companies to use free software is easy like sending an e-mail. I'm honestly envious.
But still, the fact that the person already said that not using Windows isn't an option and you persisted questioning wasn't very nice, so I see no reason for you to be rude and offensive when someone call out your behavior. Please keep it civil.