Skip to content

Instantly share code, notes, and snippets.

@karussell

karussell/preview-git-pull-request.txt

Last active April 30, 2019 17:10
Show Gist options
  • Save karussell/4171590 to your computer and use it in GitHub Desktop.
Save karussell/4171590 to your computer and use it in GitHub Desktop.
Download ZIP
Preview git merge
Raw
preview-git-pull-request.txt
This is a lot easier: https://gist.github.com/piscisaureus/3342247
Step 1: Check out a new branch to test the changes — run this from your project directory
git checkout -b dajac-jsoup-1.7.1 master
Step 2: Bring in dajac's changes and test ('jsoup-1.7.1' acts as commit message)
git pull https://github.com/dajac/snacktory.git jsoup-1.7.1
Step 3: Merge the changes and update the server
git checkout master
git merge dajac-jsoup-1.7.1
git push origin master
@intern
Copy link

intern commented Mar 3, 2016

Fuck.

@Stevoisiak
Copy link

This is super helpful! Thanks!

For reference, how would you preview a git squash and merge?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment