In Visual Studio, do I need to rebase FROM the current branch (
COREv2.0
) ONTOmaster
?
Yes.
One of the first rule of Git is that you can only change the branch you have checked out i.e. the “current branch”.
(Side note: The reason is because a lot of git actions could end up with conflicts to solve by the user and in this case, you need to have a working directory to work into.)
The ‘onto’ branch is the one with which you want to sync with.
With a feature branch, it’s most of the time master
that you want to rebase onto..
.
Does this screenshot represent what I’m wanting to do here?
Yes.
A picture could help understand :