how to merge remote branch to local branch code example

Example 1: oevrride localwith remote branch

git reset --hard origin/master

Example 2: how to merge remote branch

//make sure you're on the local branch, then:

git pull origin YourRemoteBranch

//which is the same as:

git fetch origin YourRemoteBranch
git merge origin/YourRemoteBranch

Example 3: git merge local branch

// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_name

Tags:

Shell Example

Related