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)