Skip to content

Instantly share code, notes, and snippets.

@saimonmoore

saimonmoore/gist:82245a73f8ce7b367d16

Created December 1, 2014 14:27
Show Gist options
  • Save saimonmoore/82245a73f8ce7b367d16 to your computer and use it in GitHub Desktop.
Save saimonmoore/82245a73f8ce7b367d16 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
git checkout master
git pull --rebase
git merge --no-ff release/6.3.0-ring-nebula-entp
git push origin master
error: Your local changes to the following files would be overwritten by checkout:
Gemfile.lock
Please, commit your changes or stash them before you can switch branches.
Aborting
script/enterprise/release:1000:in `block in execute': Error executing: git checkout master (Exception)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment