Git Rebase for the Terrified

Re:Git Rebase for the Terrified by magicalhippo on Tuesday January 13, 2026 @01:16PM (#46605225)

Using SmartSVN which makes life a fair bit better but still keeps this confusing terminology.

We'll be migrating to Git this year though so.

For reference, the codebase is over 20 years old, and includes binary dependencies like libraries. Makes it easy to compile old versions when needed, not so easy on the repository size...

[ Parent | on HN ]

Re:Git Rebase for the Terrified by xorcist on Tuesday January 13, 2026 @03:33PM (#46607499)

That terminology is identical in git, likely inspired by cvs and svn, so that bit probably won't improve.

It's inherently confusing to juggle different trees, and clearly you need some terminology for it. At least this one has become a bit of a standard.

[ Parent | on HN ]

Re:Git Rebase for the Terrified by magicalhippo on Tuesday January 13, 2026 @04:29PM (#46608395)

Main reason is we have relatively few merge conflicts despite merging a lot. So I always forget between instances.

[ Parent | on HN ]