4
I’m working on a branch
calling for start/admin/status
I want to bring all the changes that are in branch master
because the project no longer has certain packages, how do I do this?
4
I’m working on a branch
calling for start/admin/status
I want to bring all the changes that are in branch master
because the project no longer has certain packages, how do I do this?
3
You can pull from another branch (in your case, the master), provided the remote branch do not present conflicts with your local branch, thus making it possible to 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, I would:
git pull origin master
If conflicts occur, you will need to do the checkout
to the master branch and do the git pull from there, solving the conflicts:
git checkout master
git pull
Browser other questions tagged git
You are not signed in. Login or sign up in order to post.
It wouldn’t be to merge between the branchs?
– Woss
I don’t know, I’m still learning about git, but it worked out here. I gave a
git pul origin master
and resolved.– Romulo Sousa