zzl zzl0
Inspired by this: https://github.com/mndrix/merge-this
Where branch A and branch B changes 2 different contiguous sets of characters on the same line, but the changes are non-overlapping. Both changes can change the line length arbitrarily.
| #!/usr/bin/python -O | |
| ################################################################################ | |
| ################################################################################ | |
| # | |
| # State-Based Text Merging Algorithm | |
| # For 6.033 Design Project 2 | |
| # TA: Katherine Fang | |
| # 9 May 2012 | |
| # |
| Note that this is sandbox. If you have not registered profiles in sandbox you | |
| will need to do so prior to making these calls. You will also need at least | |
| one campaign, ad group, and keyword before you see anything in the report. | |
| While in sandbox, we will return “dummy” data so that you can see how an actual | |
| report would look. | |
| To make it look nicer, I always export my access token prior to making calls. | |
| You could do the same for API-Scope (profile Id) if you wish. Make sure to use | |
| quotes around the access token if it isn’t URL encoded. It has a | (pipe) | |
| symbol and your shell won’t like it. |
ALTER TABLE logs.trades CHANGE recentprice price int;
Unless you are using Safari on OSX, most browsers will have some kind of free plugin that you can use to export the browser's history. So that's probably the easiest way. The harder way, which seems to be what Safari wants is a bit more hacky but it will also work for other browsers. Turns out that most of them, including Safari, have their history saved in some kind of sqlite database file somewhere in your home directory.
The OSX Finder cheats a little bit and doesn't show us all the files that actually exist on our drive. It tries to protect us from ourselves by hiding some system and application-specific files. You can work around this by either using the terminal (my preferred method) or by using the Cmd+Shft+G in Finder.
Once you locate the file containing the browser's history, copy it to make a backup just in case we screw up.
| BREW_HOME=$HOME/.homebrew | |
| $ brew install zookeeper | |
| $ C_INCLUDE_PATH=${BREW_HOME}/Cellar/zookeeper/3.3.3/include/c-client-src/ pip install zkpython |