Git rebase in Visual Studio
I suppose I'm getting confused about the wording within the Visual Studio 2019 Git Rebase UI. Silly question.
Scenario: I'm working in a branch called COREv2.0 . Bug fixes and other such things have been committed to master. COREv2.0 is still a work in progress, but I want to pull in those changes from master so I have those fixes that master has.
Thus, in my own words, I believe I want to rebase the COREv2.0 branch on the current master.
In Visual Studio, do I need to rebase FROM the current branch (COREv2.0) ONTO master? Or do I have that reversed? Does this screenshot represent what I'm wanting to do here?
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/main that you want to rebase onto..
.
Does this screenshot represent what I'm wanting to do here?
Yes.
A picture could help understand :
- How can I save username and password in Git?
- Git clone with ssh address failed
- Why does zsh kills my process every time I enter a git command
- Git ignore file for Xcode projects
- What would be a good commit message for updating package versions using Conventional Commits?
- Github, restricting third-party access to organizations
- How to check post buffer size before clone git repository?
- Git Error - key does not contain a section
- How to git remote add on a new device without fatal: detected dubious ownership in repository
- Version control for large binary files and >1TB repositories?
- Where is `git add` in Visual Studio Code?
- Changes to git repository immediately after cloning?
- What is `git restore` and how is it different from `git reset`?
- GIT get the commit hash prior to a specific commit
- git grep and xargs in Windows Batch file?
- Rollback to previous version in Gitlab
- How to remove secrets from a blob?
- How to change the conflict markers?
- How to change main screen layout?
- How do I update my bare repo?
- How to search string in all files in codebase, and list occurrences including the commit date
- Trying to commit Git files but getting :: fatal: LF would be replaced by CRLF in <some file in repo>
- Unable to git commit
- How can I resolve "Recv failure: Connection reset by peer" error
- git status shows fatal: bad object HEAD
- Git - Ignore files during merge
- Remove local git tags that are no longer on the remote repository
- Branch descriptions in Git
- git: undo all working dir changes including new files
- Pushed tag is not coming up on Bitbucket