How to update the master branch from another branch?

Question

How to update the master branch from another branch?

Navigation

#1 by (2 votes)

3

I'm working on a branch called start/admin/status I want to bring all the changes that are in branch master because the project does not have certain packages anymore, how do I do this?

git

asked by anonymous 28.08.2018 / 02:28

1 answer

Dynamic allocation problem - realloc () Find the most repeating value

score 2 · Answer 1

You can pull another branch (in this case, the master) as long as the branch does not conflict with your local branch, so you can merge fast -forward .

So just give the command git pull followed by the name of the remote repository and branch:

git pull <repositorio> <nome-branch>

In your case, it would look like:

git pull origin master

If conflicts occur, you will need to checkout to the master branch and git pull from there, resolving conflicts:

git checkout master
git pull