As I am still very new to git, I pulled a real boner and deleted the entire branch from my local and remote git repos. Permanently. (Still can't believe I did that.)
Here is the merge error fix for the issue. The change is exactly the same as request #4245.
Issue by thefirstofthe300 Wednesday Jul 17, 2013 at 02:40 GMT Originally opened as https://github.com/adobe/brackets/pull/4488
As I am still very new to git, I pulled a real boner and deleted the entire branch from my local and remote git repos. Permanently. (Still can't believe I did that.)
Here is the merge error fix for the issue. The change is exactly the same as request #4245.
thefirstofthe300 included the following code: https://github.com/adobe/brackets/pull/4488/commits