These are chat archives for binarymist/HolisticInfoSec-For-WebDevelopers-Fascicle0

17th
Jul 2016
Kim Carter
@binarymist
Jul 17 2016 02:37
Left comment on #40
Russ McRee
@holisticinfosec
Jul 17 2016 18:47
Updated my fork with your latest then made the minor tweaks to Chapters 4, 5, and 6 there.
Kim Carter
@binarymist
Jul 17 2016 20:08
Yip, will be working through soon. Thanks
Kim Carter
@binarymist
Jul 17 2016 20:18
There are conflicts, so looks like it has to be manually merged.
Kim Carter
@binarymist
Jul 17 2016 21:24
Which specific changes did I not include? Most of what I'm seeing currently appear to be new edits. Process and Practises chapter can't be merged, the entire file is a merge conflict.
Russ McRee
@holisticinfosec
Jul 17 2016 21:57
Yeah, I had conflicts too so I just grabbed your most current, dropped it on top of my fork and made what are a very few minor tweaks. There should be only a few edits, many of which were the removal of extra   causing whitespace in Process and Practises. If you did that yourself without merging, you'd nail most of it. I can just send you notes on the others after the fact. By the way Github baffles me a good bit of the time so blame me for that.
Kim Carter
@binarymist
Jul 17 2016 22:08
How did you go about updating your fork here holisticinfosec/HolisticInfoSec-For-WebDevelopers@55a5677 @holisticinfosec? It looks like you only got the Physical chapter, which means any edits after that will be out of sync with my master.
Russ McRee
@holisticinfosec
Jul 17 2016 22:11
I literally copied raw from chs. 4, 5 & 6 https://github.com/binarymist/HolisticInfoSec-For-WebDevelopers-Fascicle0/tree/master/manuscript/markdown/main to my the same pages in my fork. No merge or pull
I only did that with 4, 5, 6. Intro thru 3 I just did in your repo.
Kim Carter
@binarymist
Jul 17 2016 22:12
You must have copied from an old commit of mine?
As the latest code doesn't have that typo.
So I'm not sure how you're updating your fork
As it's introduced a huge amount of conflicts that I can't merge.
Russ McRee
@holisticinfosec
Jul 17 2016 22:15
Raw copy for fork update due to conflicts. Let's keep it easy. Disregard my latest for 4, 5 and 6. If you pull the extra   out ch 4 you'll have most of my changes. I'll just send you notes after you're at a stopping point. None of these updates are significant, really small stuff
Sorry Gitter keep cutting out the ampersands I'm talking about in Ch 4,
Kim Carter
@binarymist
Jul 17 2016 22:16
There should not be any conflicts if you synk your fork from my latest and start work on that
You're essentially cloning again.
Russ McRee
@holisticinfosec
Jul 17 2016 22:17
Yeah, kept telling me there were conflicts so just copied raw
from your latest
Clearly that didnt work so well
Kim Carter
@binarymist
Jul 17 2016 22:18
Probably easier to blow you're repo away and just create another fork
Russ McRee
@holisticinfosec
Jul 17 2016 22:18
Kim Carter
@binarymist
Jul 17 2016 22:21
All my commits are pushed to master. The two canonical bits of documentation you need are: https://help.github.com/articles/fork-a-repo/ and https://help.github.com/articles/using-pull-requests/
So blow your repo away and work through those docs and we'll be good to go. Git can take a bit to get used to.
Russ McRee
@holisticinfosec
Jul 17 2016 22:23
Yeah, I just smoked it. Last night I submitted a pull request, and THEN did raw copy of 4, 5, 6. That's what messed s**t up.
Kim Carter
@binarymist
Jul 17 2016 22:24
Oh, dear!
Russ McRee
@holisticinfosec
Jul 17 2016 22:24
That, and I try to do everything in the web ui vs command line client
Kim Carter
@binarymist
Jul 17 2016 22:24
mm, I rarely use the github gui. It can be helpful, but living on the command line has all the power ;-)
Russ McRee
@holisticinfosec
Jul 17 2016 22:25
Yeah, my fail. I can see that for sure
Kim Carter
@binarymist
Jul 17 2016 22:25
But understanding git takes time, if you're not used to it, it can be a step learning curve. Sorry for the pain.
Really appreciating your edits too.
Kim Carter
@binarymist
Jul 17 2016 22:27
Good thing about git, is that it's really hard to screw something up beyond repair.
Heh
but once you start to get it, it's insanely flexible and powerful.
Russ McRee
@holisticinfosec
Jul 17 2016 22:29
I know, just gotta get off my butt and learn it
Kim Carter
@binarymist
Jul 17 2016 22:44
Same number of commits in each repo is a good start
Commit hashes look the same, should be good.
Russ McRee
@holisticinfosec
Jul 17 2016 22:45
Groovy, now we'll see if I can do this without effing it up
Kim Carter
@binarymist
Jul 17 2016 22:46
Don't stress! How much time did you loose?
Russ McRee
@holisticinfosec
Jul 17 2016 22:47
Not much at all, the changes aren't significant. Just fine tuning.
Kim Carter
@binarymist
Jul 17 2016 22:47
My wife lost over an hour about a week ago. She was editing on the github UI and lost her changes :worried:
Cool
Kim Carter
@binarymist
Jul 17 2016 22:55
git reflog contains every movement you ever made.
git reset --hard [your reference from reflog] rewrites history. It's awsom for getting out of bad pickles
Like a time machine