qwen

joined 2 years ago
[–] qwen@lemmy.blahaj.zone 5 points 2 years ago

Reads in Gianni's voice

[–] qwen@lemmy.blahaj.zone 1 points 2 years ago

Isn't that a maxx0r joke

[–] qwen@lemmy.blahaj.zone 0 points 2 years ago (1 children)

kid named reading the tweet yourself instead of reading a re-telling of a tweet:

I often look up the tweets/original news stories just because media often twists the context or grasps at straws to make for a flashier headline.

[–] qwen@lemmy.blahaj.zone 3 points 2 years ago (1 children)

mate what happened with those ls

[–] qwen@lemmy.blahaj.zone 5 points 2 years ago

No, that will happen whenever you pull in the changes from them. You basically do a merge of their branch into your branch, which is really similar to making a PR to them (in the former case you integrate their changes into your repo, in the latter it's vice versa). In both cases Git will observe two conflicting sets of changes (one branch modified what another branch removed)

[–] qwen@lemmy.blahaj.zone 2 points 2 years ago (7 children)

If the themes change in the upstream, I think you'll still end up with "both modified" type conflict, "modified by them and deleted by us".

[–] qwen@lemmy.blahaj.zone 4 points 2 years ago (1 children)

How is that not the Onion

[–] qwen@lemmy.blahaj.zone 2 points 2 years ago
[–] qwen@lemmy.blahaj.zone 1 points 2 years ago (1 children)

Why can't I see some of the images in the posts?

view more: ‹ prev next ›