rebase just pulls in the changes from a branch and keeps your changes on top. if you do a -i with rebase it lets you squash, reorder commits and a bunch of other things. It's very powerful IMO.
Sure, but if you have 15 commits on your branch you'd have to cherry-pick all 15s. rebase is much easier to use, but it is equivalent if you want to use that.
It has other features (squash, reorder, etc) which are really handy that I mentioned earlier though for the standard behavior that is equivalent.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
rebase just pulls in the changes from a branch and keeps your changes on top. if you do a -i with rebase it lets you squash, reorder commits and a bunch of other things. It's very powerful IMO.
So is it the equivalent of making a fresh branch off of the other branch, then cherry-picking all your commits back onto it? E.g.:
==
Sure, but if you have 15 commits on your branch you'd have to cherry-pick all 15s. rebase is much easier to use, but it is equivalent if you want to use that.
It has other features (squash, reorder, etc) which are really handy that I mentioned earlier though for the standard behavior that is equivalent.