git rebase master into feature branch code example

Example 1: git merge master into branch

# 2. merge feature branch to origin/master branch
$ git checkout master
$ git pull origin/master

$ git merge feature
$ git push origin/master

Example 2: merge master into local branch

git checkout feature1
git merge master

Example 3: git rebase vs merge

Git rebase and merge both integrate changes from one branch into another. Where they differ is how it's done. Git rebase moves a feature branch into a master. Git merge adds a new commit, preserving the history

Example 4: how to rebasde

$ git checkout experiment
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: added staged command

Example 5: merge master into feature branch

git checkout feature1
git merge master