search

brackets-userland / brackets-git

brackets-git — git extension for adobe/brackets
Other
656 stars 192 forks source link

Switching branches failed. #1146

Closed code0wl closed 8 years ago

code0wl commented 9 years ago

[I'm supposed to describe steps to replicate my issue here and if I don't do that, I understand that my issue will be probably ignored.]

Brackets 1.4.0-16380 (mac), Git 2.3.2 (Apple Git-55) & Brackets-Git 0.14.29

Switching branches failed.

Error: error: Your local changes to the following files would be overwritten by checkout:
    src/templates/html/pages/test-reporter.html
Please, commit your changes or stash them before you can switch branches.
Aborting
call: git checkout MS-264
Error: error: Your local changes to the following files would be overwritten by checkout:
    src/templates/html/pages/test-reporter.html
Please, commit your changes or stash them before you can switch branches.
Aborting
    at Object.exports.toError (file:///Users/oz/Library/Application%20Support/Brackets/extensions/user/zaggino.brackets-git/src/ErrorHandler.js:162:19)
    at NodeConnection.<anonymous> (file:///Users/oz/Library/Application%20Support/Brackets/extensions/user/zaggino.brackets-git/src/Cli.js:176:44)
    at j (file:///Users/oz/Dropbox/Brackets.app/Contents/www/thirdparty/thirdparty.min.js:559:26911)
    at Object.k.fireWith (file:///Users/oz/Dropbox/Brackets.app/Contents/www/thirdparty/thirdparty.min.js:559:27724)
    at NodeConnection._receive (/utils/NodeConnection.js:498:34)