# current branch is dev git branch *dev # Merge branch new_feature to dev git pull origin new_feature # revert back the merge git reset --hard origin/dev