Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

use different file name for development version #3472

Merged
merged 3 commits into from
Aug 27, 2016

Conversation

mrose17
Copy link
Member

@mrose17 mrose17 commented Aug 27, 2016

i was running under both /Applications and npm run watch/npm start
and had some unfortunate interactions

auditor: @bbondy

i was running under both `/Applications` and `npm run watch/npm start`
and had some unfortunate interactions
@mrose17 mrose17 added this to the 0.11.6dev milestone Aug 27, 2016
@mrose17 mrose17 self-assigned this Aug 27, 2016
@@ -132,7 +132,7 @@ var boot = () => {
if ((bootP) || (client)) return

bootP = true
fs.access(statePath, fs.FF_OK, (err) => {
fs.access(pathName(statePath), fs.FF_OK, (err) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pathName could probably just be called only once again above instead of repeatedly below, downside is that someone could forget to call it when using statePath (which isn't actually a path) later. I'll merge though.

@bbondy bbondy merged commit 09257c6 into master Aug 27, 2016
@bbondy
Copy link
Member

bbondy commented Aug 27, 2016

btw if something in a pull request is committed then reverted, then it should just be rebased out completely and not included in the pull request.

@bbondy
Copy link
Member

bbondy commented Aug 27, 2016

You can do that with an interactive rebase for future ref: git rebase -i master and then delete out the lines for the commits that are not needed.
If you just want to undo a commit and it is the top-most thing you can do git reset HEAD^ --hard or to undo the commit and keep the things staged git reset HEAD^ --soft

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants