Fixes merge conflict

Author: tinganho

.gitignore

@@ -21,14 +21,16 @@ tests/services/baselines/local/*
 tests/baselines/prototyping/local/*
 tests/baselines/rwc/*
 tests/baselines/test262/*
-tests/baselines/reference/projectOutput/*
+tests/baselines/reference/projectOutput/*
 tests/baselines/local/projectOutput/*
 tests/services/baselines/prototyping/local/*
 tests/services/browser/typescriptServices.js
+scripts/configureNightly.js
 scripts/processDiagnosticMessages.d.ts
 scripts/processDiagnosticMessages.js
-scripts/importDefinitelyTypedTests.js
+scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
 src/harness/*.js
+src/compiler/diagnosticInformationMap.generated.ts
 rwc-report.html
 *.swp
 build.json
@@ -44,8 +46,10 @@ scripts/run.bat
 scripts/word2md.js
 scripts/ior.js
 scripts/*.js.map
+scripts/typings/
 coverage/
 internal/
 **/.DS_Store
-.settings/*
-!.settings/tasks.json
+.settings
+.vscode/*
+!.vscode/tasks.json

.npmignore

@@ -3,6 +3,11 @@ doc
 scripts
 src
 tests
-Jakefile
+internal
+tslint.json
+Jakefile.js
+.editorconfig
+.gitattributes
+.settings/
 .travis.yml
-.settings/
+.vscode/

.settings/tasks.json

@@ -0,0 +1,42 @@
+// Available variables which can be used inside of strings.
+// ${workspaceRoot}: the root folder of the team
+// ${file}: the current opened file
+// ${fileBasename}: the current opened file's basename
+// ${fileDirname}: the current opened file's dirname
+// ${fileExtname}: the current opened file's extension
+// ${cwd}: the current working directory of the spawned process
+{
+    "version": "0.1.0",
+    "command": "jake",
+    "isShellCommand": true,
+    "showOutput": "silent",
+    "tasks": [
+        {
+            "taskName": "local",
+            "isBuildCommand": true,
+            "showOutput": "silent",
+            "problemMatcher": [
+                "$tsc"
+            ]
+        },
+        {
+            "taskName": "lint-server",
+            "args": [],
+            "problemMatcher": {
+                "owner": "typescript",
+                "fileLocation": ["relative", "${workspaceRoot}"],
+                "pattern": {
+                    "regexp": "^(warning|error)\\s+([^(]+)\\s+\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(.*)$",
+                    "severity": 1,
+                    "file": 2,
+                    "location": 3,
+                    "message": 4
+                },
+                "watchedTaskBeginsRegExp": "^\\*\\*\\*Lint failure\\*\\*\\*$",
+                "watchedTaskEndsRegExp": "^\\*\\*\\* Total \\d+ failures\\.$"
+            },
+            "showOutput": "always",
+            "isWatching": true
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,70 @@
+TypeScript is authored by:
+
+* Adam Freidin
+* Ahmad Farid 
+* Anders Hejlsberg
+* Arnav Singh
+* Arthur Ozga
+* Basarat Ali Syed 
+* Ben Duffield
+* Bill Ticehurst 
+* Bryan Forbes 
+* Caitlin Potter 
+* Chris Bubernak
+* Colby Russell 
+* Colin Snover
+* Cyrus Najmabadi
+* Dan Quirk 
+* Daniel Rosenwasser
+* David Li 
+* Dick van den Brink 
+* Dirk Bäumer 
+* Frank Wallis 
+* Gabriel Isenberg
+* Gilad Peleg 
+* Guillaume Salles 
+* Harald Niesche
+* Ingvar Stepanyan
+* Ivo Gabe de Wolff 
+* James Whitney 
+* Jason Freeman
+* Jason Ramsay 
+* Jed Mao
+* Johannes Rieken 
+* Jonathan Bond-Caron
+* Jonathan Park
+* Jonathan Turner
+* Josh Kalderimis
+* Kagami Sascha Rosylight
+* Keith Mashinter
+* Kenji Imamula
+* Lorant Pinter 
+* Masahiro Wakame
+* Max Deepfield
+* Micah Zoltu 
+* Mohamed Hegazy 
+* Oleg Mihailik
+* Oleksandr Chekhovskyi 
+* Paul van Brenk 
+* Pedro Maltez 
+* Philip Bulley
+* piloopin
+* Ron Buckton 
+* Ryan Cavanaugh 
+* Sheetal Nandi
+* Shengping Zhong
+* Shyyko Serhiy
+* Simon Hürlimann
+* Solal Pirelli
+* Stan Thomas
+* Steve Lucco
+* Tien Hoanhtien
+* Tingan Ho
+* togru
+* Tomas Grubliauskas
+* TruongSinh Tran-Nguyen
+* Vladimir Matveev
+* Wesley Wigham
+* Yui Tanglertsampan
+* Zev Spitz 
+* Zhengbo Li

AUTHORS.md

@@ -9,7 +9,7 @@ Design changes will not be accepted at this time. If you have a design change pr
 ## Legal
 You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.
 
-Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to <cla@microsoft.com>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. Please note that we're currently only accepting pull requests of bug fixes rather than new features.
+Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to <cla@microsoft.com>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. 
 
 ## Housekeeping
 Your pull request should: