-
Notifications
You must be signed in to change notification settings - Fork 0
Home
For Mac this will probably work: https://github.com/dannycoates/node-inspector
For windows:
1.) Install node-inspector globally like the github page says
npm install -g node-inspector
2.) Since our app is weird, you can't use start.js to debug. Use app_server:
node --debug server/app_server.js
3.) Launch another dos prompt
node-inspector
4.) Open the URL http://127.0.0.1:8080/debug?port=5858 Open the scripts tag and set breakpoints. Run shit. Debug.
open /Applications/Google\ Chrome.app/ --args --disable-web-security
Kinda follow this: http://www.geekgumbo.com/2010/05/12/installing-and-using-p4merge-in-git-for-windows/
- Download Perforce here: http://www.perforce.com/downloads/complete_list
- Run P4Merge once to get rid of the BS prompts
- Reboot since it added C:\Program Files\Perforce to your PATH
- Edit these 2 files: C:\Users\Paul.gitconfig D:\Work\shoutbreak_git.git.config
Add these lines to them:
[diff] tool = p4merge [difftool "p4merge"] cmd = "p4merge.exe $LOCAL $REMOTE" [merge] tool = p4merge [mergetool "p4merge"] cmd = "p4merge.exe $BASE $LOCAL $REMOTE $MERGED" trustExitCode = true keepBackup = false
The first file should save the setting globally. The second saves it only for your repo, and is probably overkill.
That's it.
git difftool to compare workspace to staging git difftool --cached to compare staging to latest commit
git mergetool will work if there are conflicts