Closed mhalverson closed 11 years ago
Hi Matt,
There are too many changes so the merge cannot be performed automatically and manually seems to be very difficult as well. Can you send me the changes you've done so I will add them manually to the code on my side.
Thanks, Igor.
Hi Igor,
Sure thing.
I created an IntelliJ patchfile and attached it to this email (to apply it, go to IntelliJ -> VCS -> Apply Patch). If you are developing H-Rider outside of IntelliJ, then the patchfile is very human-readable... it's only 10 lines difference across only 3 files, so I'd just open it up in Notepad and do the edits manually. Alternatively, I can actually sit down and learn how Git works and try to submit a more reasonable pull request ;)
-Matt
On Mon, Aug 26, 2013 at 2:27 AM, Igor Cher notifications@github.com wrote:
Hi Matt,
There are too many changes so the merge cannot be performed automatically and manually seems to be very difficult as well. Can you send me the changes you've done so I will add them manually to the code on my side.
Thanks, Igor.
— Reply to this email directly or view it on GitHubhttps://github.com/NiceSystems/hrider/pull/47#issuecomment-23252222 .
Implemented
Hi Igor, The only change is the last commit, by me:
(1) When editing xml or json, the "save" button has been renamed "mark for save". (2) When you click on "mark for save", the button for actually saving modified rows to HBase is highlighted. Before, you had to click "mark for save", then click on a separate row, before you were allowed to actually save the changes.
Cheers, -Matt Halverson