#dev | Logs for 2015-10-31

« return
[00:09:02] <Bytram> TheMightyBuzzard: you still around? Was wondering if you could walk me through getting my code changes up to github
[00:09:16] * TheMightyBuzzard looks at Bytram
[00:09:24] * TheMightyBuzzard looks at his whiskey glass
[00:09:31] * TheMightyBuzzard looks back at Bytram
[00:09:38] <TheMightyBuzzard> possibly but no guarantees
[00:09:41] * Bytram chuckles
[00:09:51] <Bytram> is simple; only one file changed
[00:10:19] <TheMightyBuzzard> git status will give you a handy link to it for copy pasta
[00:10:23] <TheMightyBuzzard> git add file
[00:10:28] <TheMightyBuzzard> git commit
[00:10:35] <TheMightyBuzzard> type stuff n save
[00:10:48] <TheMightyBuzzard> git push origin branchname
[00:11:04] <TheMightyBuzzard> then go to your repo and hit the pull request button
[00:12:34] <Bytram> okay, just finished those up throgh git push
[00:12:55] <Bytram> fwiw, branch name is: admin_story_align
[00:13:04] * Bytram launches github
[00:14:00] <Bytram> https://github.com
[00:14:01] <aqu4> ^ "3marty-b/rehash · GitHub"
[00:14:18] * Bytram waits
[00:14:49] <Bytram> selects: Branch: admin_story_align
[00:15:01] <TheMightyBuzzard> don't gotta select nothin
[00:15:09] <TheMightyBuzzard> main page will have a pull request button
[00:15:10] <Bytram> Clicks on: Pull request
[00:15:32] <Bytram> (links to: https://github.com)
[00:15:32] <aqu4> No title found.
[00:15:47] <Bytram> urg! got a 404 on that one
[00:15:56] <Bytram> clicked on back in my browser
[00:16:00] <TheMightyBuzzard> gets to sit there for the night. i'm not merging while drinking.
[00:16:18] <Bytram> clicked on Copare
[00:16:34] <Bytram> code changes I want are there.
[00:16:49] <Bytram> s/Copare/Compare/
[00:18:43] <Bytram> bah. somehow seems to be finding rejected/declined changes
[00:22:04] <Bytram> silly goose -- says I'm not logged in! DOH!
[00:23:15] <TheMightyBuzzard> leaving it to you. you'll figger it out. i gots faith.
[00:24:16] -!- Subsentient has quit [Remote host closed the connection]
[00:24:26] -!- Subsentient [Subsentient!~WhiteRat@Soylent/Staff/Editor/Subsentient] has joined #dev
[00:25:05] <Bytram> hmmm, looks like I might have done it...
[00:25:09] <Bytram> I see: Admin story align #224
[00:29:43] <Bytram> I'm guessing that did it... don't see anything else to do from this end. Checked my e-mail, but don't see anything yet, but could be delayed... will keep an eye on #github
[00:31:30] cmn32480|away is now known as cmn32480
[01:15:59] -!- aqu4 has quit [Ping timeout: 272 seconds]
[01:17:15] -!- Subsentient has quit [Ping timeout: 272 seconds]
[01:18:31] -!- audioguy has quit [Ping timeout: 272 seconds]
[01:25:31] -!- Subsentient [Subsentient!~WhiteRat@Soylent/Staff/Editor/Subsentient] has joined #dev
[01:27:34] -!- aqu4 [aqu4!~aqu4bot@universe2.us/ircbot/aqu4] has joined #dev
[01:56:55] cmn32480 is now known as cmn32480|away
[02:12:58] -!- Tachyon_ [Tachyon_!~Tachyon@xuco.me] has joined #dev
[02:13:12] -!- Tachyon has quit [Read error: Connection reset by peer]
[03:19:52] -!- audioguy [audioguy!~audioguy@Soylent/Staff/Developer/audioguy] has joined #dev
[03:19:52] -!- mode/#dev [+v audioguy] by SkyNet
[03:26:13] Bytram is now known as Bytram|away
[03:49:28] -!- crutchy_ [crutchy_!~crutchy@709-27-2-01.cust.aussiebb.net] has joined #dev
[03:52:25] -!- crutchy has quit [Ping timeout: 272 seconds]
[03:55:03] crutchy_ is now known as crutchy
[06:31:02] -!- crutchy_ [crutchy_!~crutchy@709-27-2-01.cust.aussiebb.net] has joined #dev
[06:35:11] -!- crutchy has quit [Ping timeout: 272 seconds]
[06:43:01] crutchy_ is now known as crutchy
[12:54:50] <TheMightyBuzzard> fuck a duck, Bytram, you double worked me. did the rejected/declined work even though i told ya i'd already done it.
[12:55:46] <TheMightyBuzzard> also, change the displayed text all you like but leave the code alone. [% CASE 'reject' %] needs to stay that way unless we have a compelling reason to change it.
[12:59:01] <TheMightyBuzzard> thirdly, steer clear of db changes until you understand our new changes to the db system. you'll hafta ask pj or nc about it though cause i'm not fully understanding it myself yet.
[14:41:27] Bytram|away is now known as Bytram
[14:43:08] <Bytram> TheMightyBuzzard: sorry about the reject/decline code getting in there! I thought I had reset things in my repo to be same as on github and only wanted to submit the one change!
[14:44:13] <TheMightyBuzzard> you can still go back n change things until it gets merged. would be obliged if you'd un-reject/decline everything.
[14:44:16] <Bytram> I had created a new branch and onlyy made one chance in it and that was the branch that I tried to provide... it's all that git showed had changed. beats me how the other stuff (reject/decline) still got in there!
[14:44:35] <TheMightyBuzzard> yeah, you musta done the reject/decline stuff in master
[14:45:28] <Bytram> oh, so instead of re=initializing my repo to match the master and make my changes to THAT, I could just code back through the coding changes i made, put back reject where ever I had put decline, and that will have no 'lingering effects'
[14:45:28] <Bytram> ?
[14:45:37] <TheMightyBuzzard> yep
[14:45:42] <Bytram> hadn't thought of that
[14:45:46] <TheMightyBuzzard> then push it to origin master
[14:45:55] <TheMightyBuzzard> er not master but whatever branch you're on
[14:46:10] <Bytram> and, to my credit, I *did* try to reset my repo to be the same as the master before coding that one change; don't know what went south.
[14:46:13] <Bytram> nod nod
[14:46:35] <TheMightyBuzzard> will see about reseting to where ya should be after the pr is taken care of.
[15:04:19] <Bytram> TheMightyBuzzard: okay, I've backed out all the changes I made, and did these commands:
[15:04:21] <Bytram> git add
[15:04:25] <Bytram> git commit
[15:04:40] <Bytram> git push origin admin_story_align
[15:04:58] <TheMightyBuzzard> cool beans, lemme check the pr now
[15:05:06] <Bytram> and I'm now back to doing stuff on github, right?
[15:05:45] <Bytram> seeing as I'm working on something that had already been started, I suspect the next step is gonna be different than before?
[15:05:53] <TheMightyBuzzard> error
[15:05:59] <Bytram> what is 'pr' ??
[15:06:02] <TheMightyBuzzard> pull request
[15:06:07] <Bytram> ahhh! thanks
[15:06:22] <Bytram> I have not yet done the pr.
[15:06:46] <Bytram> as far as I know, I'm at the point where my NEXT step is to do stuff on github
[15:06:51] <TheMightyBuzzard> look at your pull request on https://github.com
[15:06:53] <aqu4> ^ "3Admin story align by marty-b · Pull Request #224 · SoylentNews/rehash · GitHub"
[15:07:04] * Bytram clicks
[15:07:14] <TheMightyBuzzard> yes, you have done the pr. you can keep changing a pull request up until it is merged
[15:07:26] <Bytram> ooooh! nice
[15:07:27] * Bytram smles
[15:07:39] <TheMightyBuzzard> but there's still changes need undone
[15:07:44] <Bytram> nod nod
[15:07:47] * Bytram islooking
[15:13:34] <Bytram> TheMightyBuzzard: this time for sure! (/me channels bullwinkle the moose)
[15:14:01] <Bytram> I need to be at work in just over an hour -- gonna hit the showers and check back in a bit
[15:14:07] <TheMightyBuzzard> yup, squared away
[15:14:08] <Bytram> thanks for all your help!!!! MUCH appreciated
[15:19:24] <Bytram> ok, I got a few minutes atm
[15:19:37] <Bytram> how do I reset so that I am exactly same as master?
[15:19:52] <Bytram> can I do it all from git in my VM?
[15:23:12] <Bytram> if so, please just list the commands here and I'll get to them when I return.
[15:23:15] <Bytram> afk
[15:31:04] <TheMightyBuzzard> right now just checkout master and git pull upstream master
[15:31:28] <TheMightyBuzzard> SHOULD take care of you. lemme know if it don't
[15:48:28] <Bytram> k
[15:49:29] <Bytram> checkout master did not work; needed git in front of it:
[15:49:31] <Bytram> git checkout master
[15:49:55] <Bytram> Switched to branch 'master'
[15:50:09] <Bytram> Your mbranch is up to date with 'origin/master'
[15:50:21] <Bytram> git pull upstream master
[15:50:30] <Bytram> nucha status stull
[15:50:42] <Bytram> *bunch of status stuff
[15:50:50] <Bytram> fast -forward..
[15:51:07] <Bytram> plugs/Admin/templates/listSotires;admin;default | 4 ++--
[15:51:19] <Bytram> 1 file changes, 2 insertions(+), 2 deletions(-)
[15:51:28] <Bytram> looks good!
[15:51:29] <Bytram> THANKS!
[15:51:32] <Bytram> afk again
[15:55:29] Bytram is now known as Bytram|away
[16:08:03] <TheMightyBuzzard> you'll need to git push origin master as well
[16:08:25] <TheMightyBuzzard> so your remote repo is in sync with your local one
[16:58:20] cmn32480|away is now known as cmn32480
[16:58:37] cmn32480 is now known as cmn32480|away
[18:46:05] -!- Subsentient has quit [Remote host closed the connection]
[18:46:15] -!- Subsentient [Subsentient!~WhiteRat@Soylent/Staff/Editor/Subsentient] has joined #dev
[22:22:53] <crutchy> ooh marty-b showing up in the spy channel
[22:22:58] <crutchy> Bytram|away++