[CLOSED] Fix for issue #5800

[core-ai-bot]

Issue by sathyamoorthi
Wednesday Nov 06, 2013 at 06:20 GMT
Originally opened as adobe/brackets#5866

---

@JeffryBooher Fix for issue #5800 introduced by adobe/brackets#4590

---

sathyamoorthi included the following code: https://github.com/adobe/brackets/pull/5866/commits

[core-ai-bot]

Comment by ingorichter
Saturday Nov 09, 2013 at 00:54 GMT

---

@sathyamoorthi Would you mind resolving the merge issue? I'd like to get this PR into master. Thank you.

[core-ai-bot]

Comment by sathyamoorthi
Saturday Nov 09, 2013 at 05:24 GMT

---

@ingorichter Shall i include other changes that this adobe/brackets#5497 contains. They merged new file system into brackets. So we don't have issues to add other improvements that i gave in this PR (adobe/brackets#5497)

[core-ai-bot]

Comment by sathyamoorthi
Saturday Nov 09, 2013 at 10:02 GMT

---

@ingorichter I think, i should have fixed your merge issues. Please take a look.

[core-ai-bot]

Comment by ingorichter
Tuesday Nov 12, 2013 at 00:36 GMT

---

@sathyamoorthi wow, I think this looks like a lot of changes. I would recommend to check out a clean copy of the repo and apply your changes there and submit a new PR. I don't know how to fix the current PR to only contain the changes that you've made. Sorry for telling you that.

[core-ai-bot]

Comment by njx
Tuesday Nov 12, 2013 at 02:01 GMT

---

This PR looks clean to me--only 3 line diffs and 4 commits (of which two were merge commits). Maybe GitHub got briefly confused?

[core-ai-bot]

Comment by sathyamoorthi
Tuesday Nov 12, 2013 at 02:37 GMT

---

Ok let me give new PR. But, shall i include my other changes in this PR (close other improvements) to my new PR?

[core-ai-bot]

Comment by sathyamoorthi
Tuesday Nov 12, 2013 at 07:35 GMT

---

@ingorichter I created two new pull requests.

adobe/brackets#5951 - only few lines of changes to fix issue 5800.

adobe/brackets#5952 - it has fix for issue 5800 along with some improvements. They were discussed already in this PR adobe/brackets#5497.

But please pull any one of this before sprint 34. If you pull 5951, let 5952 open and assign it to@JeffryBooher. And i really don't know why my 'upstream/master' merge commits are stick along with these pull requests.

I only ran these two commands based on this document.

git fetch upstream
git fetch upstream/master

If you still feel anything weird, please do let me know. I can delete my entire fork and create new fork for this PR.

[core-ai-bot]

Comment by ingorichter
Tuesday Nov 12, 2013 at 19:13 GMT

---

@njx weird. The page to show all the diffs was hardly rendered.