snabelen.no is one of the many independent Mastodon servers you can use to participate in the fediverse.
Ein norsk heimstad for den desentraliserte mikroblogge-plattformen.

Administrert av:

Serverstatistikk:

456
aktive brukere

#swe

5 innlegg5 deltakere0 innlegg i dag

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.

Great presentation by the highly valued James Coplien: Agile to Product-Led: A Step Forward—or backward?
Exploring problem-space in complex system, why root-cause analysis fails, why agile fails, why building the right process helps building the right product,..

Must-see for all product and #SWE if you haven't yet.
youtube.com/watch?v=ee0Dulbi6z