-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CLOSED] Expand / Collapse All for "Find In Files" result. #5279
Comments
Comment by MarcelGerber Maybe we could make this more visible, when we do it like this users have to remember one more trick. |
Comment by larz0
|
Comment by sathyamoorthi
|
Comment by larz0
|
Comment by sathyamoorthi
|
Comment by sathyamoorthi
|
Comment by larz0
|
Comment by TomMalbran I totally forgot about this PR. I guess I just did a full code review. Haven't tested it yet since is quite behind master. Could you merge it with master too? I guess I could revive this PR if |
Comment by larz0 Thanks |
Comment by sathyamoorthi
|
Comment by TomMalbran You can do it (I was going to do it if I got no response in like a week or 2). We still need to wait for Sprint 36 to end, and we will have like 3 more weeks until Sprint 37 when this could be released, so we have plenty of time. |
Comment by sathyamoorthi
|
Comment by TomMalbran
|
Comment by sathyamoorthi
|
Comment by TomMalbran
It looks like the commits got messed up? There are a few repeated and one from dangoor. |
Comment by sathyamoorthi
_It looks like the commits got messed up? There are a few repeated and one from dangoor._ When I do big merge (2 months data) from upstream, i think github got confused sometimes. But i'm not sure about this either. But this PR should not have any issue, while you pull it in. |
Comment by TomMalbran
One other question (maybe to Maybe you are doing some sort of rebase? I never got this issue by just doing a fetch and then a merge. Anyway, before merging, do you think you could do a rebase? There are lots of commits and most aren't needed. |
Comment by sathyamoorthi _One other question (maybe to Hmmm. I'm not sure. Let we here it from And i would like to coin the other feature that i think, would be very useful. How about sorting search results based on file names? _Maybe you are doing some sort of rebase? I never got this issue by just doing a fetch and then a merge. Anyway, before merging, do you think you could do a rebase? There are lots of commits and most aren't needed._ yes i did rebase to my master. I think, something i'm doing wrong while merging upstream->master->branch. If you feel this is an issue to accept this PR, let me close this PR and create new clear PR. |
Comment by sathyamoorthi _One other question (maybe to Hmmm. I'm not sure. Let we here it from And i would like to coin the other feature that i think, would be very useful. How about sorting search results based on file names? _Maybe you are doing some sort of rebase? I never got this issue by just doing a fetch and then a merge. Anyway, before merging, do you think you could do a rebase? There are lots of commits and most aren't needed._ yes i did rebase to my master. I think, something i'm doing wrong while merging upstream->master->branch. If you feel this is an issue to accept this PR, let me close this PR and create new clear PR. |
Comment by larz0 I won't be able to test it out since I'm on vacation til Feb 7. Let's see what it's like first without adding any extra stuff and then we can decide later if it's needed. |
Comment by sathyamoorthi
|
Comment by TomMalbran It does makes sense that if you want to see one file you just open that one, and the scroll will not be an issue. If it becomes an issue, it can be fixed later. Rebasing is a hard thing to manage and it not always ends up ok. I guess it will not be a problem merging it like this, but if you can rebase it into 1 commit, I think that will be better. |
Comment by peterflynn Another option for making a "cleaner" PR would be to just generate a .patch file for the original branch, make a new clean branch off of master, and then apply the .patch file there. There's a tutorial on creating & applying .patches here, for example: http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/ |
Comment by njx Even easier would be to just create a new branch off master, and then |
Comment by TomMalbran Thanks for the info. Should I do it or BTW, at which point do we request for a rebase? |
Comment by sathyamoorthi
|
Issue by sathyamoorthi
Wednesday Oct 30, 2013 at 05:46 GMT
Originally opened as adobe/brackets#5757
Based on this Google groups discussion
CC:
@
larz0,@
njx,@
TomMalbransathyamoorthi included the following code: https://github.com/adobe/brackets/pull/5757/commits
The text was updated successfully, but these errors were encountered: