I appreciate that she acknowledges that rebase is a weird thing to do to a branch. I know it's an ordinary part of many folks' workflows, but it's such a footgun.
Many hosts allow you to set rules to protect branches from getting their commits removed in the remote (in fact, I think that's the default for gitlab main branches) or to prevent people from pushing their commits to them directly.
I expect even "the main branch has to stay more or less in sync with origin/main" can be automated... though it might not be what you always want, depending how you work.
7 Comments
thanks_shakey_snake@lemmy.ca · 8 pts · 2y
I appreciate that she acknowledges that rebase is a weird thing to do to a branch. I know it's an ordinary part of many folks' workflows, but it's such a footgun.
Ferk@kbin.social · 4 pts · 2y
Many hosts allow you to set rules to protect branches from getting their commits removed in the remote (in fact, I think that's the default for gitlab main branches) or to prevent people from pushing their commits to them directly.
I expect even "the main branch has to stay more or less in sync with origin/main" can be automated... though it might not be what you always want, depending how you work.
thanks_shakey_snake@lemmy.ca · 4 pts · 2y
I think that's treading into "GitLab/Hub/Bitbucket/etc. are not git" territory. Good feature, but not in the product that the post is about.
Still glad you mentioned it, though-- Maybe someone just learned about it because of you.
apd@programming.dev · 2 pts · 2y
is reflog very unfriendly UI? what would make it better?
SpaceNoodle@lemmy.world · -7 pts · 2y
Basic literacy
apd@programming.dev · 0 pts · 2y
I'm not sure how one would reach reflog the ability to read or write
pelotron@midwest.social · 1 pts · 2y
Reflog has saved my ass many times.