Resetting master to 7693ff1 and adding .beaut to the .gitignore file
Do not merge your branch into master if it contains the poison commit
99b81fc02, which appeared last night (10/4/2016) at 7pm EDT.
How can you know if your branch contains this commit?
Run this command in your branch:
> git merge-base 99b81fc02 HEAD
If it returns 99b81fc02, then it does. How will you fix your branch if you've
already merged this commit into it?
*sigh* You'll need to create a new branch from the version before you merged
master into your branch, and then you'll need to re-merge master and then
cherry-pick all subsequent commits you've made to your branch since.
BUT you can't do that until after you've cleaned up your version of master.
How will you clean up your version of master. One of two ways.
> git checkout master; git reset --hard 7693ff1; git pull
or
> git fetch; git reset origin/master —hard; git branch -d master; git checkout master
Hopefully, you did not pull master between last night and this morning, and hopefully
you did not merge master into your branch between last night and this morning. But
many of you, of course, did. Contact me if you have trouble. aleaverfay@gmail.com.