samizdat icon indicating copy to clipboard operation
samizdat copied to clipboard

Experimental

Open bejbus opened this issue 13 years ago • 3 comments

this is the master with erb and js merged together

bejbus avatar Dec 21 '11 19:12 bejbus

This pull request contains a lot of useful code that should be merged, but it's grown too long and unwieldy to merge in one go. Lets get your other pull requests merged and then break this up into a series of smaller pull requests rebased onto the tip of the master branch.

When you rebase it, please squash all bugfix commits, it's much easier to review when every commit represents one functional change in its final form.

Please also make sure that all unit (ts_samizdat.rb) and functional (tc_robot.rb) tests pass at least for the tip of your pull request. Last time I looked at this pull requests there were some unit test failures.

angdraug avatar Aug 12 '13 06:08 angdraug

Its already done (I mean squashing) (my branches erb and js) and you've already merged them into your own branch experimental, even with some your fixes :)

bejbus avatar Aug 24 '13 18:08 bejbus

Thanks :) My experimental branch was WIP, AFAIR I didn't finish making it actually work when I stopped working on it. I'll have another look and try to remember why I didn't merge it to master, maybe it's in better shape than I remember.

angdraug avatar Aug 26 '13 18:08 angdraug