These are chat archives for truetandem/fedramp-dashboard

8th
Aug 2016
Laura Gehardt
@lauraGgit
Aug 08 2016 14:16
do you mind quickly explaining your git flow
?
should I be looking at gh-pages or master?
also, if that could be documented that would be helpful
Bryan Allred
@bmallred
Aug 08 2016 14:17
@lauraGgit for updated code? just master probably
gh-pages is updated via a git-hook on commits made in the master branch
Laura Gehardt
@lauraGgit
Aug 08 2016 14:18
ok, just checking because gh-pages has ~200 more commits
Bryan Allred
@bmallred
Aug 08 2016 14:19
yeah that gets any commit made to the master branch which can be very crazy.
Laura Gehardt
@lauraGgit
Aug 08 2016 14:19
so you are rebasing on master?
Bryan Allred
@bmallred
Aug 08 2016 14:20
for gh-pages? no
oh master
lol, no, up to the dev more or less
Laura Gehardt
@lauraGgit
Aug 08 2016 14:21
ok, no worries, I was just noticing how many more commits, so wanted to make sure I was looking at the right thing
Bryan Allred
@bmallred
Aug 08 2016 14:22
not a problem
Bryan Allred
@bmallred
Aug 08 2016 16:14
@lauraGgit is it okay to push to the master branch or should we freeze that for the time being?
Laura Gehardt
@lauraGgit
Aug 08 2016 16:24
I'm going to probably addressing as an issue, so i think you are good to push to master
Bryan Allred
@bmallred
Aug 08 2016 16:30
anything on we can do to assist with the issuE?
Laura Gehardt
@lauraGgit
Aug 08 2016 16:30
sorry, i meant that the stuff i'm coming up with i will list as an issue, so it won't effect the code
issues actually
Bryan Allred
@bmallred
Aug 08 2016 16:31
ah good to go
Bryan Allred
@bmallred
Aug 08 2016 22:25
take cover
:)
John Flores
@floresj
Aug 08 2016 22:50
@lauraGgit just threw a grenade in our repo.
Bryan Allred
@bmallred
Aug 08 2016 22:53
Lol