Return to Answer

You have two options:

The first is a merge, but this creates an extra commit for the merge.

Checkout each branch:

git checkout b1 

Then merge:

git merge origin/master 

Then push:

git push origin master 

Alternatively, you can do a rebase:

git fetch git rebase origin/master 

You have two options:

The first is a merge, but this creates an extra commit for the merge.

Checkout each branch:

git checkout b1 

Then merge:

git merge origin/master 

Then push:

git push origin b1 

Alternatively, you can do a rebase:

git fetch git rebase origin/master 

You have two options:

The first is a merge, but this creates an extra commit for the merge.

Checkout each branch:

git checkout b1 

Then merge:

git merge origin/master 

Then push:

git push origin master 

Alternatively, you can do a rebase:

git rebase master 

You have two options:

The first is a merge, but this creates an extra commit for the merge.

Checkout each branch:

git checkout b1 

Then merge:

git merge origin/master 

Then push:

git push origin master 

Alternatively, you can do a rebase:

git fetch git rebase origin/master 

You have 2 Options.

The First is a merge, but this creates an extra commit for the merge.

Checkout each branch

git checkout b1 

then merge

git merge origin/master 

then push

git push origin master 

Alternatively, you can do a rebase:

git rebase master 

You have two options:

The first is a merge, but this creates an extra commit for the merge.

Checkout each branch:

git checkout b1 

Then merge:

git merge origin/master 

Then push:

git push origin master 

Alternatively, you can do a rebase:

git rebase master