2
What's your opinion on git rebase vs git merge?
(lemmy.sdf.org)
Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
Resources
Rules
Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.
It's correct that
rebase
rewrites history, but it's important to identify when it's not acceptable. If you are working on a branch that is shared by others (typicallymain
), you should never userebase
. But it's an acceptable practice when used properly. I userebase
on my feature branches whenever necessary. If it fell behind themain
branch I dogit fetch
followed bygit rebase origin/main
, resolve the merge conflicts and keep coding. I also use interactiverebase
when I need to tidy things up before merging the feature branch tomain
.