search

wendlers / mpfshell

A simple shell based file explorer for ESP8266 Micropython based devices ⛺
MIT License
396 stars 84 forks source link

fix win10 console out garbled code when used up/down/left/right/tab/e… #66

Closed junhuanchen closed 5 years ago

skorokithakis commented 5 years ago

Ah, apparently the discrepancies are because of the conflicts... Can you merge master locally so they get resolved?

skorokithakis commented 5 years ago

Just a sec, this PR keeps growing. Are you sure this is one single, self-contained piece of functionality?

junhuanchen commented 5 years ago

Oh! sorry ! I thought there was only one submission!

junhuanchen commented 5 years ago

Ah, apparently the discrepancies are because of the conflicts... Can you merge master locally so they get resolved?

Sure, I can update the latest one first and then do the merge ：）

skorokithakis commented 5 years ago

Sure, I can update the latest one first and then do the merge

Great, sounds good! Then these will merge cleanly.

skorokithakis commented 5 years ago

I thought there was only one submission!

What do you mean? The best way is to make one submission per feature, so we can discuss and merge independently without one feature that needs more work blocking all the others, although you may not be able to do this now, since all the code is in your branch. If not, just cherry-pick what you want and we can merge it one by one.

junhuanchen commented 5 years ago

I thought there was only one submission!

What do you mean? The best way is to make one submission per feature, so we can discuss and merge independently without one feature that needs more work blocking all the others, although you may not be able to do this now, since all the code is in your branch. If not, just cherry-pick what you want and we can merge it one by one.

That's it. I see, because I kind of forgot my changes.

junhuanchen commented 5 years ago

I thought there was only one submission!

What do you mean? The best way is to make one submission per feature, so we can discuss and merge independently without one feature that needs more work blocking all the others, although you may not be able to do this now, since all the code is in your branch. If not, just cherry-pick what you want and we can merge it one by one.

well, just a moment. I'll take it apart and merge it separately, and explain the reason for the change.