How to pull git changes?

Question

git

There is a project on Vue, in this project there are 3 branches:
1.master
2.dev
3.my (for example)
I work with 3.my branch and another person with 2.dev branch.
So he made changes in his branch, and I need to pull all his changes into my branch.
How to do it right?

Answer 1

Merge his branch into your own + resolve conflicts :)
GIT - how to merge two branches?

Answer 2

1. git checkout mybranch
2. git pull origin dev

Answer 3

Use the rules for teamwork:
https://habr.com/post/106912/
A very sensible article. I advise. If you want, contact me, I'll show you how it all works for us.