Git Merge in Visual Studio 2019 v16.9.2

Question

Git Merge in Visual Studio 2019 v16.9.2

Albertk 106

I have a master/Main branch which is the default and also a branch called "version2". Is it possible to merge Version2 to the master. I don't seems be able to find the option. Any Help would be appreciated. Thank you.

Sina Taghavi 1 Reputation point

2021-05-06T15:01:36.167+00:00

In VS 16.9.4,
-checkout mater, then,
-in the Git Changes window, click on the little down-facing black triangle (sorry, I don't remember the name) to the right of the field containing the name master.
-In the menu that unfurls, select the branch that will be your source (here, the branch called version2),
-move your mouse to the right click on the down-facing triangle and select Merge into Current Branch.

Accepted answer

1 additional answer

Your answer

Sina Taghavi 1 Reputation point

2021-05-06T15:01:36.167+00:00

In VS 16.9.4,
-checkout mater, then,
-in the Git Changes window, click on the little down-facing black triangle (sorry, I don't remember the name) to the right of the field containing the name master.
-In the menu that unfurls, select the branch that will be your source (here, the branch called version2),
-move your mouse to the right click on the down-facing triangle and select Merge into Current Branch.

Answer 1

Peter Toye 191

@Albertk
The workaround I've found is to use Git outside of VS. I agree this is a pain, but MS seem to have a very one-dimensional view of how you should use Git.

I installed Git-Bash some time ago and the commands

git checkout master  
git merge version2

should work on your local repository.

You probably should close down VS (or at least the project) before doing this - I've not tried with VS open in case it breaks something.

Donald Brookes 11 Reputation points

2021-06-16T19:36:37.947+00:00
There have been a lot of updates to VS 2019 and that can be easily done right in VS.

Open Code project in VS 2019.

Go to menu item "Git" at the top and select "Manage Branches"

There will be a list of your branches.

Select branch "version2" and right mouse and select the item "Merge 'version2' into 'master'

That's it.
John Merritt 1 Reputation point

2022-04-04T20:56:08.467+00:00

For future reference, in VS 2019 you need have master (or whatever branch your merging into) checked out before you can right-click the incoming branch, version2 in this case, and merge it into master.

Answer 2

Ken Tucker 5,861

With GIT you need to create a Pull Request to merge your code into another branch in the remote repository

https://devblogs.microsoft.com/devops/conduct-a-git-pull-request-on-visual-studio-online/#:~:text=Open%20the%20web%20portal.%20In%20your%20web%20browser%2C,Reviewers%20make%20comments%20on%20specific%20lines%20of%20code.

Locally in the Git changes window make the active branch the branch you want to merge into. At top of the window is a drop down list a list of branches hit the arrow at the right hand side of the branch you want to merge from. In the list that shows select merge into current branch

Peter Toye 191 Reputation points

2021-04-14T10:58:21.057+00:00

@Ken Tucker
I have the same question, and I note that the original query didn't say anything about remote repositories. My repository is local.

If I right-click on the 'master' branch in the Manage Branches window when 'version 2' is checked out, I can merge 'master' into 'version 2' or rebase 'version 2' onto 'master. It looks from the wording as if the merge option will end up with 'version 2' as the merged version - just what I don't want. If 'master' is checked out the options are greyed out.

If I right-click on 'version 2' when 'master' is checked out i can only merge or rebase 'version 2' onto itself, which doesn't sound useful.

I have to admit that I'm a Git newbie, so the terminology is a bit confusing and I may have got it wrong.

Share via

Git Merge in Visual Studio 2019 v16.9.2

1 additional answer

Your answer