search

brackets-userland / brackets-git

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

Pulling from remote failed #1228

Closed morshadunnur closed 8 years ago

morshadunnur commented 8 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.5.0-16538 (win), Git 2.5.0.windows.1 & Brackets-Git 0.14.32

Pulling from remote failed

Error: merge: origin/effc771 - not something we can merge
call: git merge origin/effc771
Error: merge: origin/effc771 - not something we can merge
    at Object.exports.toError (file:///C:/Users/mohammad/AppData/Roaming/Brackets/extensions/user/zaggino.brackets-git/src/ErrorHandler.js:162:19)
    at NodeConnection.<anonymous> (file:///C:/Users/mohammad/AppData/Roaming/Brackets/extensions/user/zaggino.brackets-git/src/Cli.js:185:44)
    at j (file:///C:/Program%20Files%20(x86)/Brackets/www/thirdparty/thirdparty.min.js:556:26911)
    at Object.k.fireWith (file:///C:/Program%20Files%20(x86)/Brackets/www/thirdparty/thirdparty.min.js:556:27724)
    at NodeConnection._receive (/utils/NodeConnection.js:498:34)