[21:46] <thumper> waigani: morning
[21:46] <waigani> thumper: morning
[21:46] <thumper> waigani: https://plus.google.com/hangouts/_/g7oraq255eaz4jgtkfbtptrcm4a?authuser=1&hl=en
[21:47] <waigani> thumper: I have to login with other account - 5min
[21:47] <thumper> waigani: I could just invite the other you
[21:48] <waigani> thumper: in
[21:48] <waigani> thumper: can't hear you?
[21:49] <thumper> ah, couldn't hear you either
[21:49] <waigani> thumper: I'm doing a restart hang on
[21:49] <thumper> ok
[23:22] <mwhudson> ubuntu@linaro-test:~$ juju version
[23:22] <mwhudson> 1.18.1-trusty-armhf
[23:22] <mwhudson> this is on a arm64 system
[23:24] <thumper> hm...
[23:26]  * mwhudson upgrades to 1.20
[23:28] <mwhudson> $ juju version
[23:28] <mwhudson> 1.20.0-trusty-arm64
[23:28] <mwhudson> ok that's better
[23:28] <thumper> mwhudson: what did you do?
[23:28] <mwhudson> deploying a local charm still doesn't work though
[23:28] <mwhudson> thumper: added the juju/stable ppa and updated
[23:28] <thumper> mwhudson: I've deployed local charms
[23:29] <mwhudson> i'm sure some people ahve :)
[23:29] <thumper> can you pastebin the directory layout and the command, and output?
[23:29] <mwhudson> thumper: are you in #juju?
[23:29] <thumper> yeah
[23:29] <mwhudson> scroll up a bit? :)
[23:45] <thumper> mwhudson: how is your git?
[23:45] <mwhudson> thumper: passable, fairly uneven
[23:46] <thumper> mwhudson: do you know how to merge changes from another branch but not the actual revisions?
[23:46] <thumper> bonus points for interactive merge
[23:46] <mwhudson> thumper: no
[23:46] <thumper> ok
[23:46]  * thumper does some git hunting
[23:46] <mwhudson> i guess you can do the merge and reset --soft the merge commit out?
[23:47] <mwhudson> or is it just reset
[23:47] <mwhudson> then commit the changes again
[23:47] <thumper> git merge --squash
[23:47] <thumper> this may be the heart of my new pipeline work
[23:47] <thumper> since I can't interactively merge
[23:48] <thumper> I think I'll merge everything
[23:48] <thumper> then revert some things
[23:48] <thumper> or stash
[23:48] <thumper> is git stash linked to a branch?