How to update a branch with git

Coding Beginning Blender Code and Development
1

hi all,

can someone tell me how to update a branch.
I am at the moment in the function branch and i want to update this branch how can i do that with git bash ?

2

I’m relatively new to Git, but as far as I know:

  1. Add.
  2. Commit.
  3. Push.
3

Also, if you like GUIs, I’d check out Sourcetree. I use it and even though it’s initially wired towards BitBucket, you can use it for Git just fine and it’s so much nicer to work with than Bash, IMO.

4

just run git pull as usual.

5

Thanks LazyDodo,

I dont know exactly the workflow for updating the branches and master.
At the moment i switch to master.

git checkout master
git pull

Than back to the branch

git checkout  some branch
git pull
./make.bat full

Or is a Subversion of the master a branch and i can update the master and all branches with the loop.

git submodule foreach git checkout master
git submodule foreach git pull --rebase origin master

I mean the master and the branch change a lot and i need a way to get the updated branch with the coresponding master. without updating each individual.
Hope this make sense…in any way.

6

What I do is this:

git pull

and for addons:

git submodule init

git submodule update
7

but what is
git pull
doing ?

Does git pull updating only the master or also a branch which is merged to the master, if i am in the master branch with.

git chekcout master

8

given you are using make.bat, safe to assume you are on windows, you can just check out any branch you want (or stick to master doesn’t really matter) and once checked out, you can run

make update

It will update everything for you, code + submodules + svn updates, will work on master, will work on branches.