How do I merge current master branch into my branch visual studio/azure devops?

Question

So I have the master branch, and another branch, lets call it 'branch2', that I am working on that is based off of the master branch. There are important changes in the current master branch that were made from someone else that I need to merge into branch2. Just wondering how to do this within visual studio or azure devops.

Answer 1

In VS,

1. open the git pane.
2. View the branches sub-pane.
3. Expand the'origin' branch
4. right click the master branch (under origin)
5. select merge master branch in origin\branch 2
6. under local branches right branch 2 pull latest
7. done