jattenberg commented 6 years ago

ensuring the admissable_set is actually a list in the readme for now

jattenberg commented 6 years ago

oh boy. i am worried that i may have created a git hell situation

akelleh commented 6 years ago

hahahha. Two options:

Option one: fresh start (1) close this branch on github. change to your master branch locally (2) pull the remote master, picking up your previous changes (3) branch off of master, and make this new change (4) submit a new PR for that branch

or

Option two: git hell (1) Do an rebase and resolve the merge conflict in the readme (2) force push over this branch in the existing PR

On Tue, Nov 14, 2017 at 1:49 PM, josh attenberg notifications@github.com wrote:

oh boy. i am worried that i may have created a git hell situation

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/akelleh/causality/pull/52#issuecomment-344358523, or mute the thread https://github.com/notifications/unsubscribe-auth/ABrkQOBD7Brqf55zDYOdQ3sZPbj5Wlhlks5s2eCkgaJpZM4Qd0GM .

--

111 East 18th St., NY, NY 10003

1 Most Innovative Company In The World – Fast Company

http://www.fastcompany.com/3056057/most-innovative-companies/buzzfeed-for-shaking-up-media-across-the-globe

akelleh commented 6 years ago

End result looks good. I'll go ahead and merge

akelleh / causality

casting a set to a list #52

1 Most Innovative Company In The World – Fast Company