Skip to content

Instantly share code, notes, and snippets.

@cmbaughman
Created May 4, 2018 14:58
Show Gist options
  • Save cmbaughman/e63900c573ec2cd7662ca0ced6a27e90 to your computer and use it in GitHub Desktop.
Save cmbaughman/e63900c573ec2cd7662ca0ced6a27e90 to your computer and use it in GitHub Desktop.
Locally merge a Git pull request.

Check out, review, and merge locally

  1. Fetch and check out the branch for this merge request
git fetch origin
git checkout -b servtest origin/servtest
  1. Review the changes locally
  2. Merge the branch and fix any conflicts that come up
git checkout master
git merge --no-ff servtest
  1. Push the result of the merge to GitLab
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment