News for hackers. Stuff that matters.
Re:Can we communally deprecate git checkout? by baobun on Friday January 10, 2025 @02:24AM (#42653451)
Counterpoint: I do both.

There are situations that make one or the other clearly preferred within a repo, besides per-repo/org-consistency for more widely shared work. After a few years excavating in a merge-only-salt-mine as well as working orgs where merge commits are banned you get a feeling for what's helpful when (esp considering auditability and history legibility).

Always rebase incoming feature branch on the base branch before merging into a shared repo regardless of approach, though - "merged from main" inside a merge commit on main makes anything an inscrutable tangly mess very quickly.

There are no comments on this comment yet.