| Makyo | guihelp small review for subordinate relations: https://github.com/juju/juju-gui/pull/39 | 00:22 |
|---|---|---|
| hatch | I can do it | 00:23 |
| Makyo | Cool, thanks. | 00:23 |
| Makyo | Ran into all sorts of problems with git. | 00:23 |
| Makyo | Decided I wasn't going to take any guff from that swine, took a patch, rebuilt dev env, applied :P | 00:24 |
| Makyo | Which, for future reference, is git diff develop > ../patch; cd ..; rm -rf env; git clone ...; git checkout -b ...; git apply ../patch | 00:25 |
| Makyo | The problem being that a juju-sync that leads to conflicts will leave your history dirty after you resolve them. | 00:25 |
| rick_h__ | Makyo: yea, that was the email that went around I think. | 00:44 |
| Makyo | Yeah. Just had it happen in a weird stage of working. | 00:45 |
| rick_h__ | Makyo: we (I) had made a mistake in helping hatch earlier in the week so several of us walked through it and then hatch sent the email with the notes on how to fix | 00:45 |
| hatch | yeah sheesh don't you read your emails ;) | 00:45 |
| rick_h__ | I more meant it was to be expected :) | 00:46 |
| rick_h__ | and apologize some more for it | 00:46 |
| Makyo | I don't see it, for what its worth. | 00:46 |
| Makyo | It's fine, I got it working. | 00:46 |
| Makyo | Just didn' tknow how to patch/apply with git untilnow | 00:47 |
| hatch | it's pretty cool using cherry-pick too | 00:47 |
| rick_h__ | the other thing was to cherry-pick. I walked hatch through that way and it was cool | 00:47 |
| Makyo | Yeah, even with cherry-pick I was getting history. | 00:48 |
| Makyo | I think because my origin got messed up. | 00:48 |
| Makyo | Had to clone off juju/juju-gui.git, then fix origin. | 00:48 |
| hatch | ahhh yeah | 00:50 |
| hatch | that was the first part | 00:50 |
| rick_h__ | yea, had to blow away the develop branch, recreate it from the juju version, and then cherry pick the commits across to a fresh feature branch | 00:51 |
| Makyo | Yeah. | 00:51 |
| Makyo | I already had the patch, so that was fast at least. | 00:53 |
| rick_h__ | damn dell, I've got a monitor arm, a display port 1.2 cable for a monitor...but no monitor | 00:53 |
| hatch | hehe boooooo | 00:59 |
| rick_h__ | first review is out though | 01:00 |
| rick_h__ | http://uk.hardware.info/reviews/5100/dell-ultrasharp-up2414q-review-24-inch-uhd--4k-monitor | 01:03 |
| rick_h__ | it'll be interesting. The mention of it showing up on some hardware as two 1920x2160 displays makes me wonder if Ubuntu/X will see it so. And I'll have 'dual monitors' on one screen. | 01:05 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!