Just make sure things are working while doing this. Maybe accepting your changes and the incoming changes is the correct way, but you need to know what you are doing.

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.

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

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.

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?

Imagine when they learn about executives. Also it is funny that no one mentions BG3 when talking about DEI consultancy groups.

Never did anyone in this steam group go out of their way to harass anyone involved with the company.

Never was it “a bunch of sexist and racist white people being upset about diversity in videogames”.

Very bold statements in favour of people that I know myself are extremely “anti diversity / anti woke”. Do you even know who the creator of the Steam group is? Guy is known for being the scum of the Brazilian WoW community.

We recently purchased the family plan even if it is quite expensive for a couple. Reading this of course made me feel better about it.

EndeavourOS on my desktop, Arch Linux on my laptop.

Beehaw won’t update so you are fine

I’m curious about the apps now lol

Can’t say anything about privacy because I haven’t used their stuff enough, however I have an iPad from 2013 in perfect state that it useless because I can’t install anything on it.

So it will be called BRICST?

Welcome!

My first instance here on Lemmy was Kbin too but I created a new account on Beehaw as soon as I learned about it.

Kbin was ok for me, the only thing I actually liked a lot was the chat tab or something that magazines had. At the time the UI there felt very frustrating for me.

I like how the administration care about the community and I think from all the others you can actually care about your instance instead of just using it as means to access other content.

Just keep in mind that Beehaw might not be here in the long-term as there’s a plan to migrate away from Lemmy. I don’t think there’s a set day to happen but it will, eventually.

I think most of us like the generic communities as it means they are well cared for/moderated