∃∀λ

@ eah @programming.dev

Posts

199
Comments

136
Joined

10 mo. ago

2w ago

The bots are becoming self aware
Jump
∃∀λ @programming.dev 2w ago
And different from them all, the compressed double dash. That’s what’s in OP’s screenshot, and they’re what you get on Lemmy and Reddit when you type two dashes together with no spaces between, and it passes for the em dash in human writing.
The dashes in the reddit post being discussed are em dashes, not en dashes. In any case, I'm skeptical of the claim that double dashes written in the reddit text input box transform into something else. Though, I no longer have a reddit account which I could use to check. It looks like there is a way to write em dashes on reddit, but it isn't with 2 sequential hyphens.

3w ago

Permanently Deleted

Shame youtube removed the like/dislike ratio which we previously used for mass protest against video authors for their wrongdoings. Channels can now shovel shit onto us with no public humiliation inflicted on them in return.

3w ago

Strange things are afoot at the Walter Reed

Jump

∃∀λ @programming.dev 3w ago

I guess your sense of correct grammar is different from mine. "Fuckin' Strait" isn't a proper noun. He's also using excessive punctuation.

3w ago

Where can I find documentations on how to resolve a git conflict properly?

Jump

∃∀λ @programming.dev 3w ago

Disclaimer: it's been a while since I've used git.

You'll be unable to push if the remote branch has diverged since you pulled because someone else has pushed changes different from your own.

One way to resolve this is to run git pull. If your commits have made changes to a file and the diverging commits have made changes to the same file, then you'll have a conflict and git will put your local repo into a special merge conflict state. Your working files involved in the conflict will be automatically changed to include the differing changes, delimited by <<<, ===, and >>> characters. You'll have the option to abort the pull or edit the files, git add them, and then git commit which completes the pull. You can then push.

git pull will do git fetch to update your copy of the remote branch, followed by a git merge. The documentation for resolving merge conflicts is contained in the git-merge man page: git help merge, particularly in the sections entitled "Pre-merge checks", "How conflicts are presented", and "How to resolve conflicts". Side note: the man page will open in the system pager, in which typing /conflict and the keys n and N will step through each occurrence of the word "conflict". Oh, you can even read it in glorious PDF.^[https://manpage.me/index.cgi?apropos=0&q=git-merge&sektion=0&manpath=Debian+8.1.0&arch=default&format=pdf]

Running git pull when you have uncommited files may be a different story entirely. Best to not do that. You can check whether your working files are clean with git status. It seems like the "proper" way to deal with this situation, if you must, is with git stash. That supposedly can be used to save your uncommited changes, cleanup your worktree to prepare it for a pull, and reapply the saved changes after.

I recommend sections in the free Pro Git book if your want something more pedagogical than the man pages.

4w ago

Github, the first enterprise cloud solution to reach zero nines reliability

Jump

∃∀λ @programming.dev 4w ago

picard.jpeg

4w ago

The Right Place to Bike

Jump

∃∀λ @programming.dev 4w ago

It's from the Polandball subreddit, so the degree to which Dutch looks like a mix of the two in the comic may be exaggerated. The characters are speaking their foreign language whilst mixing in enough English to be understandable.