Programmer since age 12, always exploring new tech and fields with a thirst for knowledge. Building cutting-edge tech solutions fueled by boundless curiosity.
You can try out git stash on some sample files and you will get the idea of what it is.
git rebase --continue works when you started rebasing (git rebase master) a branch with other branch (or master) that was ahead of it.
but yeah, if the branch that you are merging isnt ahead, git rebase might work in one shot.
git merge merges the branches (their commits) into one marking that it was merged from a branch.
Whereas git rebase takes the head of other branch, puts it in base of the branch that you are in, like the other branch was never there.
Programmer since age 12, always exploring new tech and fields with a thirst for knowledge. Building cutting-edge tech solutions fueled by boundless curiosity.
You can try out
git stashon some sample files and you will get the idea of what it is.git rebase --continueworks when you started rebasing (git rebase master) a branch with other branch (or master) that was ahead of it.but yeah, if the branch that you are merging isnt ahead,
git rebasemight work in one shot.git mergemerges the branches (their commits) into one marking that it was merged from a branch.Whereas
git rebasetakes the head of other branch, puts it in base of the branch that you are in, like the other branch was never there.It seems to un-add. Easier to use VSCode's Version Control tab, I think.
Yes VSCode's Version Control features , can help you a lot to track all this.