site banner

Friday Fun Thread for August 29, 2025

Be advised: this thread is not for serious in-depth discussion of weighty topics (we have a link for that), this thread is not for anything Culture War related. This thread is for Fun. You got jokes? Share 'em. You got silly questions? Ask 'em.

2
Jump in the discussion.

No email address required.

SVN of course had a diff merge mechanism, and one person checking out a file didn't prevent others from working on it. The checkout happened in your local copy of the central repo. When you committed, your changes are immediately sent to the central repo and you must resolve any conflicts at that time.

The difference with git is the diverging histories you mention - subversion does not allow you to have a chain of commits that diverge from the central repo that you plan to reconcile later. It has to be reconciled at every commit.