@Bubu@chaos.social
@Bubu@chaos.social avatar

Bubu

@Bubu@chaos.social

Free Software Developer living near Berlin. Working on free mobile apps and decentralized communication platforms. Previously: https://social.tchncs.de/@CCTG Previously previously: F-Droid Maintainer

I get paid for writing #python code and maintaining #embedded #linux platforms.

This profile is from a federated server and may be incomplete. Browse more on the original instance.

djlink, to random
@djlink@mastodon.gamedev.place avatar

ah, I see the old "games should be longer" discourse is making rounds again.

Bubu,
@Bubu@chaos.social avatar

@djlink Depends on the game 🙂

root42, to random
@root42@chaos.social avatar

Is there a way to resolve cherrypick conflicts purely on the command line, without using a merge tool by saying „use theirs“? Or „keep upper“?

Bubu,
@Bubu@chaos.social avatar

@root42 You can do git checkout --theirs <file>. Which works on a per-file base. Not sure if you can also do this hunk based, maybe? 🤔

(Also I'm not entirely sure if this is what you were asking about, so sorry if I'm missing the point here somewhow.)

isotopp, to random German
@isotopp@chaos.social avatar

Ich bin wahrscheinlich der @evawolfangel Antagonist.

Pünktlich, Bordrestaurant, Klo, Klima und Sitzplatz.

Bahnhof Schild Hannover Hbf

Bubu,
@Bubu@chaos.social avatar

@isotopp Hatte heute genau die selben Gedanken in Würzburg :-/.

globalc, to Japan
@globalc@chaos.social avatar

Bewildered moment this week:

At the skin doctor, first an assistant asks some questions and fills them into the computer, then says "wait for the doctor" and leaves me alone with the unlocked system. 5min, would have been enough to lookup data of other people.

Awareness for these things is low in , I touch on this in https://blog.fluxcoil.net/posts/2020/10/japan_tech_interactions/

Bubu,
@Bubu@chaos.social avatar

@globalc I don't really think this is any better in Germany unfortunately :/.

Bubu, to Matrix
@Bubu@chaos.social avatar

If you run your own server you probably want to update to v1.105.1 now: https://github.com/element-hq/synapse/security/advisories/GHSA-3h7q-rfh9-xm4v

  • All
  • Subscribed
  • Moderated
  • Favorites
  • •
  • JUstTest
  • kavyap
  • DreamBathrooms
  • thenastyranch
  • magazineikmin
  • InstantRegret
  • GTA5RPClips
  • Youngstown
  • everett
  • slotface
  • rosin
  • osvaldo12
  • mdbf
  • ngwrru68w68
  • megavids
  • cubers
  • modclub
  • normalnudes
  • tester
  • khanakhh
  • Durango
  • ethstaker
  • tacticalgear
  • Leos
  • provamag3
  • anitta
  • cisconetworking
  • lostlight
  • All magazines
    •