uplift to Brackets 1.8?

[Pomax]

Brackets has been moving along a fair bit and is currently at 1.8 rather than the 1.4 our fork is based on. Should we try to uplift?

How much of our work can be rolled back on top of an arbitrary version using something like https://github.com/facebook/jscodeshift (a tool by Facebook that they wrote to allow easy repatching of forks with code changes that a) cannot be merged into master and b) require reapplying each time HEAD updates)

/cc @humphd @gideonthomas @flukeout

[humphd]

I think we should do this, yes. I have been noticing renewed interest in developing Brackets at http://blog.brackets.io/ lately. But doing this is more than just rebasing/merging with upstream. We have a lot of one-time, manual operations we did to make the code smaller, which will potentially get undone. Not a huge problem, but something we should consider.

I also wonder if we should just cherrypick things between 1.4-1.8, since lots of the code isn't interesting to us.

[humphd]

http://stackoverflow.com/questions/4045017/what-is-git-diff-patience-for might be a friend here, too.

I think we rebasing was a bad idea, and we should have done merging with adobe/master on a regular basis. Whatever we do, we should figure out our go-forward plan, too.

[humphd]

Out of interest, I tried merging to Adobe's 1.8. It's not horrendous, but it would take a day or two to sort out the ~45 files with conflicts (and then find/fix regressions):

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

	modified:   .brackets.json
	new file:   .eslintrc.json
	modified:   .gitignore
	modified:   .gitmodules
	deleted:    .jshintrc
	modified:   .travis.yml
	new file:   CODE_OF_CONDUCT.md
	new file:   ISSUE_TEMPLATE.md
	modified:   LICENSE
	new file:   build.json
	new file:   npm-shrinkwrap.json
	new file:   samples/bg/Getting Started/index.html
	new file:   samples/bg/Getting Started/main.css
	new file:   samples/bg/Getting Started/screenshots/quick-edit.png
	new file:   samples/cs/Getting Started/index.html
	new file:   samples/cs/Getting Started/main.css
	new file:   samples/cs/Getting Started/screenshots/quick-edit.png
	modified:   samples/da/Kom godt i gang/index.html
	modified:   samples/da/Kom godt i gang/main.css
	modified:   samples/da/Kom godt i gang/screenshots/quick-edit.png
	modified:   samples/de/Erste Schritte/index.html
	modified:   samples/de/Erste Schritte/main.css
	modified:   samples/el/Getting Started/index.html
	modified:   samples/el/Getting Started/main.css
	modified:   samples/el/Getting Started/screenshots/quick-edit.png
	modified:   samples/es/Primeros Pasos/index.html
	modified:   samples/es/Primeros Pasos/main.css
	modified:   samples/fa-ir/Getting Started/index.html
	modified:   samples/fa-ir/Getting Started/main.css
	modified:   samples/fa-ir/Getting Started/screenshots/farsiquick-edit.png
	modified:   samples/fi/Aloitus/main.css
	modified:   samples/fr/Premiers pas/index.html
	modified:   samples/fr/Premiers pas/main.css
	modified:   samples/id/Memulai/index.html
	modified:   samples/id/Memulai/main.css
	modified:   samples/it/Primi passi/index.html
	modified:   samples/it/Primi passi/main.css
	modified:   samples/ja/Getting Started/index.html
	modified:   samples/ja/Getting Started/main.css
	modified:   samples/ja/Getting Started/screenshots/quick-edit.png
	modified:   samples/nl/Aan-de-slag/index.html
	modified:   samples/nl/Aan-de-slag/main.css
	modified:   samples/pl/Szybki Start/index.html
	modified:   samples/pl/Szybki Start/main.css
	modified:   samples/pt-br/Primeiros Passos/index.html
	modified:   samples/pt-br/Primeiros Passos/main.css
	modified:   samples/pt-pt/Primeiros Passos/index.html
	modified:   samples/pt-pt/Primeiros Passos/main.css
	modified:   samples/root/Getting Started/index.html
	modified:   samples/root/Getting Started/main.css
	modified:   samples/ru/Getting Started/index.html
	modified:   samples/ru/Getting Started/main.css
	modified:   samples/sv/Kom igang/index.html
	modified:   samples/sv/Kom igang/main.css
	modified:   samples/zh-tw/Getting Started/index.html
	modified:   samples/zh-tw/Getting Started/main.css
	modified:   samples/zh-tw/Getting Started/screenshots/quick-edit.png
	modified:   src/LiveDevelopment/Agents/CSSAgent.js
	modified:   src/LiveDevelopment/Agents/ConsoleAgent.js
	modified:   src/LiveDevelopment/Agents/DOMAgent.js
	modified:   src/LiveDevelopment/Agents/DOMHelpers.js
	modified:   src/LiveDevelopment/Agents/DOMNode.js
	modified:   src/LiveDevelopment/Agents/EditAgent.js
	modified:   src/LiveDevelopment/Agents/GotoAgent.js
	modified:   src/LiveDevelopment/Agents/HighlightAgent.js
	modified:   src/LiveDevelopment/Agents/NetworkAgent.js
	modified:   src/LiveDevelopment/Agents/RemoteAgent.js
	modified:   src/LiveDevelopment/Agents/RemoteFunctions.js
	modified:   src/LiveDevelopment/Agents/ScriptAgent.js
	modified:   src/LiveDevelopment/Documents/CSSDocument.js
	modified:   src/LiveDevelopment/Documents/CSSPreprocessorDocument.js
	modified:   src/LiveDevelopment/Documents/HTMLDocument.js
	modified:   src/LiveDevelopment/Documents/JSDocument.js
	modified:   src/LiveDevelopment/Inspector/Inspector.js
	modified:   src/LiveDevelopment/Inspector/jsdoc.rb
	modified:   src/LiveDevelopment/LiveDevServerManager.js
	modified:   src/LiveDevelopment/LiveDevelopment.js
	modified:   src/LiveDevelopment/LiveDevelopmentUtils.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/documents/LiveCSSDocument.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/language/HTMLSimpleDOM.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/launchers/Launcher.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/LauncherDomain.js
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/object-assign/index.js
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/object-assign/license
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/object-assign/package.json
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/object-assign/readme.md
	deleted:    src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/open/.jshintignore
	deleted:    src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/open/.jshintrc
	deleted:    src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/open/.npmignore
	deleted:    src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/open/LICENSE
	deleted:    src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/open/README.md
	deleted:    src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/open/lib/open.js
	deleted:    src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/open/package.json
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/index.js
	renamed:    src/filesystem/impls/appshell/node/node_modules/fsevents/LICENSE -> src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/license
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/package.json
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/readme.md
	renamed:    src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/open/vendor/xdg-open -> src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/xdg-open
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/pinkie-promise/index.js
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/pinkie-promise/license
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/pinkie-promise/package.json
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/pinkie-promise/readme.md
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/pinkie/index.js
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/pinkie/license
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/pinkie/package.json
	new file:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/pinkie/readme.md
	modified:   src/LiveDevelopment/MultiBrowserImpl/launchers/node/package.json
	modified:   src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/protocol/remote/DocumentObserver.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/transports/NodeSocketTransport.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/transports/node/NodeSocketTransportDomain.js
	modified:   src/LiveDevelopment/MultiBrowserImpl/transports/remote/NodeSocketTransportRemote.js
	modified:   src/LiveDevelopment/Servers/BaseServer.js
	modified:   src/LiveDevelopment/Servers/FileServer.js
	modified:   src/LiveDevelopment/Servers/UserServer.js
	modified:   src/LiveDevelopment/launch.html
	modified:   src/LiveDevelopment/main.less
	modified:   src/brackets.config.json
	modified:   src/command/CommandManager.js
	modified:   src/command/Commands.js
	modified:   src/command/KeyBindingManager.js
	modified:   src/command/Menus.js
	modified:   src/config.json
	modified:   src/document/ChangedDocumentTracker.js
	modified:   src/document/Document.js
	modified:   src/document/DocumentManager.js
	modified:   src/document/InMemoryFile.js
	modified:   src/document/TextRange.js
	modified:   src/editor/CSSInlineEditor.js
	modified:   src/editor/CodeHintList.js
	modified:   src/editor/CodeHintManager.js
	modified:   src/editor/Editor.js
	modified:   src/editor/EditorCommandHandlers.js
	modified:   src/editor/EditorManager.js
	modified:   src/editor/EditorOptionHandlers.js
	modified:   src/editor/EditorStatusBar.js
	modified:   src/editor/InlineTextEditor.js
	modified:   src/editor/InlineWidget.js
	modified:   src/editor/MultiRangeInlineEditor.js
	modified:   src/extensibility/ExtensionManager.js
	modified:   src/extensibility/ExtensionManagerDialog.js
	modified:   src/extensibility/ExtensionManagerView.js
	modified:   src/extensibility/ExtensionManagerViewModel.js
	modified:   src/extensibility/InstallExtensionDialog.js
	modified:   src/extensibility/Package.js
	modified:   src/extensibility/node/ExtensionManagerDomain.js
	modified:   src/extensibility/node/package-validator.js
	modified:   src/extensibility/node/spec/Installation.spec.js
	modified:   src/extensibility/node/spec/Validation.spec.js
	modified:   src/extensibility/registry_utils.js
	modified:   src/extensions/default/CSSCodeHints/CSSProperties.json
	modified:   src/extensions/default/CSSCodeHints/main.js
	modified:   src/extensions/default/CSSCodeHints/styles/brackets-css-hints.css
	modified:   src/extensions/default/CSSCodeHints/unittests.js
	modified:   src/extensions/default/CloseOthers/main.js
	modified:   src/extensions/default/CloseOthers/unittest-files/dummy.js
	modified:   src/extensions/default/CloseOthers/unittests.js
	modified:   src/extensions/default/CodeFolding/Prefs.js
	new file:   src/extensions/default/CodeFolding/foldhelpers/foldSelected.js
	modified:   src/extensions/default/CodeFolding/foldhelpers/foldcode.js
	modified:   src/extensions/default/CodeFolding/foldhelpers/foldgutter.js
	new file:   src/extensions/default/CodeFolding/foldhelpers/handlebarsFold.js
	modified:   src/extensions/default/CodeFolding/foldhelpers/indentFold.js
	new file:   src/extensions/default/CodeFolding/unittest-files/test.hbs
	new file:   src/extensions/default/CodeFolding/unittest-files/test.html
	new file:   src/extensions/default/CodeFolding/unittest-files/test.js
	new file:   src/extensions/default/CodeFolding/unittests.js
	modified:   src/extensions/default/CommandLineTool/main.js
	modified:   src/extensions/default/DarkTheme/main.less
	modified:   src/extensions/default/DebugCommands/ErrorNotification.js
	modified:   src/extensions/default/DebugCommands/NodeDebugUtils.js
	modified:   src/extensions/default/DebugCommands/main.js
	modified:   src/extensions/default/HTMLCodeHints/HtmlAttributes.json
	modified:   src/extensions/default/HTMLCodeHints/HtmlTags.json
	modified:   src/extensions/default/HTMLCodeHints/main.js
	modified:   src/extensions/default/HTMLCodeHints/unittests.js
	new file:   src/extensions/default/HandlebarsSupport/main.js
	modified:   src/extensions/default/HealthData/HealthDataManager.js
	modified:   src/extensions/default/HealthData/HealthDataNotification.js
	modified:   src/extensions/default/HealthData/HealthDataPopup.js
	modified:   src/extensions/default/HealthData/HealthDataPreview.js
	modified:   src/extensions/default/HealthData/HealthDataUtils.js
	modified:   src/extensions/default/HealthData/main.js
	modified:   src/extensions/default/HealthData/unittests.js
	modified:   src/extensions/default/HtmlEntityCodeHints/main.js
	modified:   src/extensions/default/HtmlEntityCodeHints/unittests.js
	modified:   src/extensions/default/InlineColorEditor/InlineColorEditor.js
	modified:   src/extensions/default/InlineColorEditor/img/color_thumb_back.png
	modified:   src/extensions/default/InlineColorEditor/img/color_thumb_back@2x.png
	modified:   src/extensions/default/InlineColorEditor/img/color_thumb_back_dark.png
	modified:   src/extensions/default/InlineColorEditor/img/color_thumb_back_dark@2x.png
	modified:   src/extensions/default/InlineColorEditor/img/grabber_color-slider.png
	modified:   src/extensions/default/InlineColorEditor/img/grabber_color-slider@2x.png
	modified:   src/extensions/default/InlineColorEditor/img/grabber_color-well.png
	modified:   src/extensions/default/InlineColorEditor/img/grabber_color-well@2x.png
	modified:   src/extensions/default/InlineColorEditor/img/grabber_gradient.png
	modified:   src/extensions/default/InlineColorEditor/img/grabber_gradient@2x.png
	modified:   src/extensions/default/InlineColorEditor/unittests.js
	modified:   src/extensions/default/InlineTimingFunctionEditor/BezierCurveEditor.js
	modified:   src/extensions/default/InlineTimingFunctionEditor/InlineTimingFunctionEditor.js
	modified:   src/extensions/default/InlineTimingFunctionEditor/StepEditor.js
	modified:   src/extensions/default/InlineTimingFunctionEditor/TimingFunctionUtils.js
	modified:   src/extensions/default/InlineTimingFunctionEditor/grid-dark.png
	modified:   src/extensions/default/InlineTimingFunctionEditor/grid.png
	modified:   src/extensions/default/InlineTimingFunctionEditor/main.js
	modified:   src/extensions/default/InlineTimingFunctionEditor/unittests.js
	modified:   src/extensions/default/JSLint/main.js
	modified:   src/extensions/default/JSLint/unittests.js
	new file:   src/extensions/default/JavaScriptCodeHints/.gitignore
	modified:   src/extensions/default/JavaScriptCodeHints/HintUtils.js
	modified:   src/extensions/default/JavaScriptCodeHints/HintUtils2.js
	modified:   src/extensions/default/JavaScriptCodeHints/MessageIds.js
	modified:   src/extensions/default/JavaScriptCodeHints/ParameterHintManager.js
	modified:   src/extensions/default/JavaScriptCodeHints/Preferences.js
	modified:   src/extensions/default/JavaScriptCodeHints/Session.js
	new file:   src/extensions/default/JavaScriptCodeHints/fix-acorn.js
	modified:   src/extensions/default/JavaScriptCodeHints/main.js
	new file:   src/extensions/default/JavaScriptCodeHints/npm-shrinkwrap.json
	new file:   src/extensions/default/JavaScriptCodeHints/package.json
	modified:   src/extensions/default/JavaScriptCodeHints/styles/brackets-js-hints.css
	deleted:    src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
	deleted:    src/extensions/default/JavaScriptCodeHints/thirdparty/tern
	modified:   src/extensions/default/JavaScriptCodeHints/unittests.js
	modified:   src/extensions/default/JavaScriptQuickEdit/main.js
	modified:   src/extensions/default/JavaScriptQuickEdit/unittests.js
	modified:   src/extensions/default/LESSSupport/main.js
	modified:   src/extensions/default/LightTheme/main.less
	new file:   src/extensions/default/NavigationAndHistory/html/recentfiles-template.html
	new file:   src/extensions/default/NavigationAndHistory/keyboard.json
	new file:   src/extensions/default/NavigationAndHistory/main.js
	new file:   src/extensions/default/NavigationAndHistory/styles/recent-files.css
	new file:   src/extensions/default/NoDistractions/main.js
	new file:   src/extensions/default/PrefsCodeHints/main.js
	new file:   src/extensions/default/PrefsCodeHints/styles/brackets-prefs-hints.css
	new file:   src/extensions/default/PrefsCodeHints/unittest-files/preferences.json
	new file:   src/extensions/default/PrefsCodeHints/unittests.js
	modified:   src/extensions/default/QuickOpenCSS/main.js
	modified:   src/extensions/default/QuickOpenHTML/main.js
	modified:   src/extensions/default/QuickOpenJavaScript/main.js
	modified:   src/extensions/default/QuickView/QuickView.less
	new file:   src/extensions/default/QuickView/preview-bg-dark.svg
	new file:   src/extensions/default/QuickView/preview-bg.svg
	deleted:    src/extensions/default/QuickView/preview_bg.png
	deleted:    src/extensions/default/QuickView/preview_bg_dark.png
	modified:   src/extensions/default/QuickView/unittests.js
	modified:   src/extensions/default/RecentProjects/main.js
	modified:   src/extensions/default/RecentProjects/unittests.js
	modified:   src/extensions/default/SVGCodeHints/SVGAttributes.json
	modified:   src/extensions/default/SVGCodeHints/main.js
	modified:   src/extensions/default/SVGCodeHints/styles/brackets-svg-hints.css
	modified:   src/extensions/default/SVGCodeHints/unittests.js
	modified:   src/extensions/default/StaticServer/StaticServer.js
	modified:   src/extensions/default/StaticServer/main.js
	modified:   src/extensions/default/StaticServer/node/StaticServerDomain.js
	modified:   src/extensions/default/StaticServer/unittests.js
	modified:   src/extensions/default/UrlCodeHints/data.json
	modified:   src/extensions/default/UrlCodeHints/main.js
	modified:   src/extensions/default/UrlCodeHints/testfiles/test.html
	modified:   src/extensions/default/UrlCodeHints/unittests.js
	modified:   src/extensions/default/WebPlatformDocs/css.json
	deleted:    src/extensions/default/WebPlatformDocs/unittest-files/description.html
	modified:   src/extensions/samples/BracketsConfigCentral/htmlContent/logo-sm.png
	modified:   src/extensions/samples/BracketsConfigCentral/main.js
	modified:   src/extensions/samples/ContextMenuTest/main.js
	modified:   src/extensions/samples/InlineImageViewer/InlineImageViewer.html
	modified:   src/extensions/samples/InlineImageViewer/InlineImageViewer.js
	modified:   src/extensions/samples/InlineImageViewer/main.js
	new file:   src/extensions/samples/InlineImageViewer/style.css
	modified:   src/extensions/samples/LocalizationExample/main.js
	modified:   src/extensions/samples/LocalizationExample/nls/fr/strings.js
	modified:   src/extensions/samples/LocalizationExample/nls/root/strings.js
	modified:   src/extensions/samples/LocalizationExample/nls/strings.js
	modified:   src/extensions/samples/LocalizationExample/strings.js
	modified:   src/extensions/samples/TypingSpeedLogger/main.js
	modified:   src/extensions/samples/circular_dependency_test/main.js
	modified:   src/extensions/samples/circular_dependency_test/secondary.js
	modified:   src/file/FileUtils.js
	deleted:    src/file/NativeFileError.js
	deleted:    src/file/NativeFileSystem.js
	modified:   src/filesystem/Directory.js
	modified:   src/filesystem/FileIndex.js
	modified:   src/filesystem/FileSystem.js
	modified:   src/filesystem/FileSystemEntry.js
	modified:   src/filesystem/FileSystemError.js
	modified:   src/filesystem/FileSystemStats.js
	modified:   src/filesystem/WatchedRoot.js
	modified:   src/filesystem/impls/appshell/AppshellFileSystem.js
	new file:   src/filesystem/impls/appshell/node/CSharpWatcher.js
	new file:   src/filesystem/impls/appshell/node/ChokidarWatcher.js
	modified:   src/filesystem/impls/appshell/node/FileWatcherDomain.js
	new file:   src/filesystem/impls/appshell/node/FileWatcherManager.js
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/CHANGELOG.md
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/Readme.md
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/binding.gyp
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/Makefile
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/Release/.deps/Makefile.d
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/Release/.deps/Release/fswatch.node.d
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/Release/.deps/Release/obj.target/fswatch/nodefsevents.o.d
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/Release/fswatch.node
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/Release/obj.target/fswatch/nodefsevents.o
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/binding.Makefile
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/config.gypi
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/fswatch.target.mk
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/gyp-mac-tool
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/fsevents.js
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/nodefsevents.cc
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents/package.json
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents_win/binding.gyp
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents_win/build/Release/fswatch_win.node
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents_win/fsevents_win.cpp
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents_win/fsevents_win.h
	deleted:    src/filesystem/impls/appshell/node/node_modules/fsevents_win/fsevents_win.js
	new file:   src/filesystem/impls/appshell/node/win32/CodeHelper.exe
	new file:   src/filesystem/impls/appshell/node/win32/CodeHelper.md
	new file:   src/filesystem/impls/appshell/node/win32/LICENSE
	modified:   src/help/HelpCommandHandlers.js
	modified:   src/htmlContent/about-dialog.html
	modified:   src/htmlContent/extension-manager-view-item.html
	modified:   src/htmlContent/findreplace-bar.html
	modified:   src/htmlContent/main-view.html
	modified:   src/htmlContent/pane.html
	modified:   src/htmlContent/problems-panel-table.html
	modified:   src/language/CSSUtils.js
	modified:   src/language/CodeInspection.js
	modified:   src/language/HTMLSimpleDOM.js
	modified:   src/language/HTMLTokenizer.js
	modified:   src/language/HTMLUtils.js
	new file:   src/language/JSONUtils.js
	modified:   src/language/JSUtils.js
	modified:   src/language/XMLUtils.js
	new file:   src/nls/bg/strings.js
	new file:   src/nls/bg/urls.js
	modified:   src/nls/cs/strings.js
	modified:   src/nls/cs/urls.js
	modified:   src/nls/da/strings.js
	modified:   src/nls/da/urls.js
	modified:   src/nls/de/strings.js
	modified:   src/nls/de/urls.js
	modified:   src/nls/el/strings.js
	modified:   src/nls/el/urls.js
	modified:   src/nls/en-gb/strings.js
	modified:   src/nls/es/strings.js
	modified:   src/nls/es/urls.js
	modified:   src/nls/fa-ir/strings.js
	modified:   src/nls/fa-ir/urls.js
	modified:   src/nls/fi/strings.js
	modified:   src/nls/fi/urls.js
	modified:   src/nls/fr/strings.js
	modified:   src/nls/fr/urls.js
	modified:   src/nls/gl/strings.js
	modified:   src/nls/hr/strings.js
	modified:   src/nls/hr/urls.js
	modified:   src/nls/hu/strings.js
	modified:   src/nls/id/strings.js
	modified:   src/nls/id/urls.js
	modified:   src/nls/it/strings.js
	modified:   src/nls/it/urls.js
	modified:   src/nls/ja/strings.js
	modified:   src/nls/ja/urls.js
	modified:   src/nls/ko/strings.js
	modified:   src/nls/ko/urls.js
	new file:   src/nls/lv/strings.js
	modified:   src/nls/nb/strings.js
	modified:   src/nls/nb/urls.js
	modified:   src/nls/nl/strings.js
	modified:   src/nls/nl/urls.js
	modified:   src/nls/pl/strings.js
	modified:   src/nls/pl/urls.js
	modified:   src/nls/pt-br/strings.js
	modified:   src/nls/pt-br/urls.js
	modified:   src/nls/pt-pt/strings.js
	modified:   src/nls/pt-pt/urls.js
	modified:   src/nls/ro/strings.js
	modified:   src/nls/root/strings-app.js
	modified:   src/nls/root/strings.js
	modified:   src/nls/root/urls.js
	modified:   src/nls/ru/strings.js
	modified:   src/nls/ru/urls.js
	modified:   src/nls/sk/strings.js
	modified:   src/nls/sr/strings-app.js
	modified:   src/nls/sr/strings.js
	modified:   src/nls/strings-app.js
	modified:   src/nls/strings.js
	modified:   src/nls/sv/strings.js
	modified:   src/nls/sv/urls.js
	modified:   src/nls/tr/strings.js
	modified:   src/nls/tr/urls.js
	modified:   src/nls/uk/strings.js
	modified:   src/nls/urls.js
	modified:   src/nls/zh-cn/strings.js
	modified:   src/nls/zh-cn/urls.js
	modified:   src/nls/zh-tw/strings.js
	modified:   src/nls/zh-tw/urls.js
	new file:   src/npm-shrinkwrap.json
	new file:   src/package.json
	deleted:    src/preferences/PreferenceStorage.js
	modified:   src/preferences/PreferencesBase.js
	modified:   src/preferences/PreferencesDialogs.js
	modified:   src/preferences/PreferencesImpl.js
	deleted:    src/project/FileIndexManager.js
	modified:   src/project/FileSyncManager.js
	modified:   src/project/FileTreeView.js
	modified:   src/project/FileTreeViewModel.js
	modified:   src/project/FileViewController.js
	modified:   src/project/ProjectModel.js
	modified:   src/project/SidebarView.js
	modified:   src/project/WorkingSetSort.js
	modified:   src/project/WorkingSetView.js
	modified:   src/search/FileFilters.js
	modified:   src/search/FindBar.js
	modified:   src/search/FindInFiles.js
	modified:   src/search/FindInFilesUI.js
	modified:   src/search/FindReplace.js
	modified:   src/search/FindUtils.js
	modified:   src/search/QuickOpen.js
	new file:   src/search/QuickOpenHelper.js
	modified:   src/search/QuickSearchField.js
	modified:   src/search/ScrollTrackMarkers.js
	modified:   src/search/SearchModel.js
	modified:   src/search/SearchResultsView.js
	new file:   src/search/node/FindInFilesDomain.js
	modified:   src/strings.js
	modified:   src/styles/Makefile
	modified:   src/styles/bootstrap/navbar.less
	modified:   src/styles/brackets.less
	modified:   src/styles/brackets_codemirror_override.less
	modified:   src/styles/brackets_core_ui_variables.less
	modified:   src/styles/brackets_fonts.less
	modified:   src/styles/brackets_mixins.less
	modified:   src/styles/brackets_patterns_override.less
	modified:   src/styles/brackets_scrollbars.less
	modified:   src/styles/brackets_shared.less
	modified:   src/styles/brackets_theme_default.less
	modified:   src/styles/brackets_variables.less
	modified:   src/styles/fonts/SourceCodePro/SourceCodePro-Medium.ttf
	modified:   src/styles/fonts/SourceCodePro/SourceCodePro-Regular.ttf
	modified:   src/styles/images/brackets_icon.svg
	modified:   src/styles/images/edit-icon.svg
	modified:   src/styles/images/extension-manager-installed.svg
	modified:   src/styles/images/extension-manager-registry.svg
	modified:   src/styles/images/extension-manager-sprite.svg
	modified:   src/styles/images/find-replace-sprites-dark.svg
	modified:   src/styles/images/find-replace-sprites.svg
	new file:   src/styles/images/flip-view-icons-dark.svg
	new file:   src/styles/images/flip-view-icons-hover.svg
	new file:   src/styles/images/flip-view-icons.svg
	modified:   src/styles/images/horiz-thumb-fw-outline.png
	modified:   src/styles/images/horizontal-dash.svg
	modified:   src/styles/images/jsTreeSprites-dark.svg
	modified:   src/styles/images/jsTreeSprites.svg
	modified:   src/styles/images/live_development_sprites.svg
	modified:   src/styles/images/no_content_bg.svg
	modified:   src/styles/images/no_content_bg_dark.svg
	new file:   src/styles/images/preview-bg-dark.svg
	new file:   src/styles/images/preview-bg.svg
	deleted:    src/styles/images/preview_bg.png
	deleted:    src/styles/images/preview_bg_dark.png
	modified:   src/styles/images/scrollbar-mac-bg.png
	modified:   src/styles/images/scrollbar-mac-corner.png
	modified:   src/styles/images/select-triangles.svg
	modified:   src/styles/images/split-view-icons-dark.svg
	modified:   src/styles/images/split-view-icons.svg
	modified:   src/styles/images/themes-icon.svg
	modified:   src/styles/images/topcoat-error-15.svg
	modified:   src/styles/images/topcoat-inactive-15.svg
	modified:   src/styles/images/topcoat-okay-15.svg
	modified:   src/styles/images/topcoat-search-20.svg
	modified:   src/styles/images/topcoat-settings-13.svg
	modified:   src/styles/images/topcoat-warning-15.svg
	modified:   src/styles/images/updateSprites.svg
	modified:   src/styles/images/update_large_icon.svg
	modified:   src/styles/images/vertical-dash.svg
	modified:   src/styles/images/vertical-thumb-fw-outline.png
	modified:   src/styles/jsTreeTheme.less
	deleted:    src/thirdparty/CodeMirror
	deleted:    src/thirdparty/less-1.7.5.min.js
	deleted:    src/thirdparty/less-config.js
	modified:   src/thirdparty/lodash.js
	modified:   src/thirdparty/path-utils
	new file:   src/thirdparty/react-dom.js
	modified:   src/utils/AnimationUtils.js
	modified:   src/utils/AppInit.js
	modified:   src/utils/Async.js
	modified:   src/utils/BuildInfoUtils.js
	modified:   src/utils/ColorUtils.js
	modified:   src/utils/Compatibility.js
	modified:   src/utils/DeprecationWarning.js
	modified:   src/utils/DropdownEventHandler.js
	modified:   src/utils/EventDispatcher.js
	modified:   src/utils/ExtensionUtils.js
	new file:   src/utils/HealthLogger.js
	modified:   src/utils/KeyEvent.js
	modified:   src/utils/LocalizationUtils.js
	modified:   src/utils/NativeApp.js
	modified:   src/utils/NodeConnection.js
	modified:   src/utils/NodeDomain.js
	modified:   src/utils/PerfUtils.js
	modified:   src/utils/Resizer.js
	modified:   src/utils/ShellAPI.js
	modified:   src/utils/StringMatch.js
	modified:   src/utils/StringUtils.js
	modified:   src/utils/TokenUtils.js
	modified:   src/utils/UpdateNotification.js
	modified:   src/utils/UrlParams.js
	modified:   src/utils/ValidationUtils.js
	modified:   src/utils/ViewUtils.js
	modified:   src/view/MainViewFactory.js
	modified:   src/view/Pane.js
	modified:   src/view/PanelManager.js
	modified:   src/view/ThemeManager.js
	modified:   src/view/ThemeSettings.js
	modified:   src/view/ThemeView.js
	modified:   src/view/ViewCommandHandlers.js
	modified:   src/view/ViewStateManager.js
	modified:   src/widgets/DefaultDialogs.js
	modified:   src/widgets/Dialogs.js
	modified:   src/widgets/DropdownButton.js
	modified:   src/widgets/ModalBar.js
	modified:   src/widgets/PopUpManager.js
	modified:   src/xorigin.js
	modified:   tasks/build.js
	modified:   tasks/cla-exceptions.json
	modified:   tasks/lib/common.js
	new file:   tasks/npm-install.js
	modified:   tasks/test.js
	modified:   tasks/update-release-number.js
	modified:   tasks/write-config.js
	modified:   test/BootstrapReporterView.js
	modified:   test/PerformanceTestSuite.js
	modified:   test/README.md
	modified:   test/SpecRunner.html
	modified:   test/SpecRunner.js
	modified:   test/TestPreferencesImpl.js
	modified:   test/UnitTestReporter.js
	modified:   test/UnitTestSuite.js
	modified:   test/jasmine.sh
	modified:   test/node/TestingDomain.js
	modified:   test/perf/OpenFile-perf-files/InlineWidget.js
	modified:   test/perf/OpenFile-perf-files/brackets-concat.js
	modified:   test/perf/OpenFile-perf-files/quiet-scrollbars.css
	modified:   test/perf/Performance-test.js
	modified:   test/smokes/citrus completed/css/desktop.css
	modified:   test/smokes/citrus completed/css/phone.css
	modified:   test/smokes/citrus completed/css/tablet.css
	modified:   test/smokes/server-tests/css/desktop.css
	modified:   test/smokes/server-tests/css/phone.css
	modified:   test/smokes/server-tests/css/tablet.css
	modified:   test/spec/Async-test.js
	modified:   test/spec/CSSInlineEdit-test.js
	modified:   test/spec/CSSUtils-test.js
	modified:   test/spec/CodeHint-test.js
	modified:   test/spec/CodeHintUtils-test.js
	modified:   test/spec/CodeInspection-test.js
	modified:   test/spec/CommandManager-test.js
	modified:   test/spec/Document-test.js
	modified:   test/spec/DocumentCommandHandlers-test.js
	modified:   test/spec/DocumentManager-test.js
	modified:   test/spec/DragAndDrop-test.js
	modified:   test/spec/Editor-test.js
	modified:   test/spec/EditorCommandHandlers-test.js
	modified:   test/spec/EditorManager-test.js
	modified:   test/spec/EditorOptionHandlers-test.js
	modified:   test/spec/EditorRedraw-test.js
	modified:   test/spec/EventDispatcher-test.js
	modified:   test/spec/ExtensionInstallation-test.js
	modified:   test/spec/ExtensionLoader-test.js
	modified:   test/spec/ExtensionManager-test.js
	modified:   test/spec/ExtensionUtils-test.js
	modified:   test/spec/FileFilters-test.js
	modified:   test/spec/FileSystem-test.js
	modified:   test/spec/FileTreeView-test.js
	modified:   test/spec/FileTreeViewModel-test.js
	modified:   test/spec/FileUtils-test.js
	modified:   test/spec/FindInFiles-test.js
	modified:   test/spec/FindReplace-test.js
	modified:   test/spec/HTMLInstrumentation-test.js
	modified:   test/spec/HTMLSimpleDOM-test.js
	modified:   test/spec/HTMLTokenizer-test.js
	modified:   test/spec/InlineEditorProviders-test.js
	modified:   test/spec/InstallExtensionDialog-test.js
	new file:   test/spec/JSONUtils-test.js
	modified:   test/spec/JSUtils-test.js
	modified:   test/spec/KeyBindingManager-test-files/duplicateShortcuts.json
	modified:   test/spec/KeyBindingManager-test-files/invalidKeys.json
	modified:   test/spec/KeyBindingManager-test-files/keymap.json
	modified:   test/spec/KeyBindingManager-test-files/keymap1.json
	modified:   test/spec/KeyBindingManager-test-files/macKeymap.json
	modified:   test/spec/KeyBindingManager-test-files/macKeymap1.json
	modified:   test/spec/KeyBindingManager-test-files/macRestrictedShortcut.json
	modified:   test/spec/KeyBindingManager-test-files/multipleShortcuts.json
	modified:   test/spec/KeyBindingManager-test.js
	modified:   test/spec/LanguageManager-test.js
	modified:   test/spec/LiveDevelopment-MultiBrowser-test-files/index.html
	new file:   test/spec/LiveDevelopment-MultiBrowser-test-files/sub/icon_chevron.png
	modified:   test/spec/LiveDevelopment-MultiBrowser-test-files/sub/test.css
	new file:   test/spec/LiveDevelopment-MultiBrowser-test-files/withoutHead.html
	modified:   test/spec/LiveDevelopment-test.js
	modified:   test/spec/LiveDevelopmentMultiBrowser-test.js
	modified:   test/spec/LowLevelFileIO-test.js
	modified:   test/spec/MainViewFactory-test.js
	modified:   test/spec/MainViewManager-test.js
	modified:   test/spec/Menu-test.js
	modified:   test/spec/MockFileSystemImpl.js
	modified:   test/spec/MockFileSystemModel.js
	modified:   test/spec/MultiRangeInlineEditor-test.js
	modified:   test/spec/NativeMenu-test.js
	modified:   test/spec/NodeConnection-test-files/BinaryTestCommands.js
	modified:   test/spec/NodeConnection-test-files/TestCommandsError.js
	modified:   test/spec/NodeConnection-test-files/TestCommandsOne.js
	modified:   test/spec/NodeConnection-test-files/TestCommandsTwo.js
	modified:   test/spec/NodeConnection-test.js
	modified:   test/spec/Pane-test.js
	modified:   test/spec/PhantomHelper.js
	modified:   test/spec/PreferencesBase-test.js
	modified:   test/spec/PreferencesManager-test.js
	renamed:    src/filesystem/impls/appshell/node/node_modules/fsevents/build/Release/linker.lock -> test/spec/ProjectManager-test-files/git/index
	modified:   test/spec/ProjectManager-test.js
	modified:   test/spec/ProjectModel-test.js
	modified:   test/spec/QuickOpen-test.js
	modified:   test/spec/QuickSearchField-test.js
	modified:   test/spec/RemoteFunctions-test.js
	new file:   test/spec/SpecRunnerUtils-test.js
	modified:   test/spec/SpecRunnerUtils.js
	modified:   test/spec/StringMatch-test.js
	modified:   test/spec/StringUtils-test.js
	modified:   test/spec/TextRange-test.js
	modified:   test/spec/ThemeManager-test.js
	modified:   test/spec/UpdateNotification-test.js
	modified:   test/spec/UrlParams-test.js
	modified:   test/spec/ValidationUtils-test.js
	modified:   test/spec/ViewCommandHandlers-test.js
	modified:   test/spec/ViewFactory-test.js
	modified:   test/spec/ViewUtils-test.js
	modified:   test/spec/WorkingSetSort-test.js
	modified:   test/spec/WorkingSetView-test.js
	modified:   test/spec/XMLUtils-test.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Gruntfile.js
	both modified:   README.md
	both modified:   package.json
	both modified:   src/LiveDevelopment/LiveDevMultiBrowser.js
	both modified:   src/LiveDevelopment/MultiBrowserImpl/documents/LiveHTMLDocument.js
	both modified:   src/LiveDevelopment/MultiBrowserImpl/language/HTMLInstrumentation.js
	both modified:   src/LiveDevelopment/MultiBrowserImpl/protocol/remote/LiveDevProtocolRemote.js
	both modified:   src/LiveDevelopment/main.js
	both modified:   src/base-config/keyboard.json
	both modified:   src/brackets.js
	both modified:   src/command/DefaultMenus.js
	both modified:   src/dependencies.js
	both modified:   src/document/DocumentCommandHandlers.js
	both modified:   src/editor/ImageViewer.js
	both modified:   src/extensions/default/CodeFolding/main.js
	both modified:   src/extensions/default/InlineColorEditor/ColorEditor.js
	both modified:   src/extensions/default/InlineColorEditor/css/main.less
	both modified:   src/extensions/default/InlineColorEditor/main.js
	both modified:   src/extensions/default/JavaScriptCodeHints/ScopeManager.js
	both modified:   src/extensions/default/JavaScriptCodeHints/tern-worker.js
	both modified:   src/extensions/default/QuickView/main.js
	both modified:   src/extensions/default/WebPlatformDocs/InlineDocsViewer.js
	both modified:   src/extensions/default/WebPlatformDocs/main.js
	both modified:   src/extensions/default/WebPlatformDocs/unittests.js
	both modified:   src/filesystem/File.js
	both modified:   src/index.html
	both modified:   src/language/HTMLDOMDiff.js
	both modified:   src/language/HTMLInstrumentation.js
	both modified:   src/language/LanguageManager.js
	both modified:   src/language/languages.json
	both modified:   src/main.js
	both modified:   src/nls/README.md
	both modified:   src/preferences/PreferencesManager.js
	both modified:   src/project/ProjectManager.js
	both modified:   src/thirdparty/immutable.js
	both modified:   src/thirdparty/react.js
	both modified:   src/utils/DragAndDrop.js
	both modified:   src/utils/ExtensionLoader.js
	both modified:   src/utils/Global.js
	both modified:   src/view/MainViewManager.js
	both modified:   src/view/WorkspaceManager.js
	both modified:   src/widgets/StatusBar.js

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	src/extensions/default/JavaScriptCodeHints/thirdparty/acorn/
	src/extensions/default/JavaScriptCodeHints/thirdparty/tern/

[Pomax]

might be worth it - we an see if any of those changes can be turned into codemods for easy reapplication on a next brackets? Is that something students might be interested in trying?