Create accountLogin

Recent searches

No recent searches

Search options

Only available when logged in.
social.tchncs.de is one of the many independent Mastodon servers you can use to participate in the fediverse.
A friendly server from Germany – which tends to attract techy people, but welcomes everybody. This is one of the oldest Mastodon instances.

Administered by:

Server stats:

3.8K
active users

social.tchncs.de: AboutProfiles directoryPrivacy policy

Mastodon: AboutGet the appKeyboard shortcutsView source codev4.3.6

#swe

1 post1 participant0 posts today
Public *
mtp

At this point in my life, I'd prefer to work through merge conflict markers by hand in a text editor without any sort of fancy GUI or other weird magic presentation.

Just show me the damned conflict, and let me work it out as text in the usual way.

Your GUI that re-arranges everything in terms of "yours" and "theirs" can die in a fire. I ain't got the energy to keep track of how that shit gets reversed in a rebase versus another flow.

#SWE#Git#Curmudgeon
Public
karlender.net

Festland

Wenn ich jetzt im Karlender über die Architektur in Devon nachdenke, während ich meine Reise nach Dartington Hall Revue passieren lasse, fällt mir auf, was ich vor allem von meiner Reise über die Bretagne nach Südwestengland mitgenommen habe. Mir war nicht bewusst, wie eng Großbritannien und die Bretagne miteinander verbunden sind. Durch den Ärmelkanal verbunden, ist hier ein […]

--
More: karlender.net/5961/
File under:

karlender.net · Festland
More from karlender.net
#adria#albertCamus#bretagne
ExploreLive feeds
About