Re: [OCLUG-Tech] want to clarify a fast-forward merge in git

2015-05-14 Thread David Manouchehri
What's happening here is that branch Y was created from commit X, and the maintainer did not rebase branch X onto branch Y before merging. It's not advised (more on that later), but nothing is stopping you from doing it either. > Y1 -- Y2 -- Y3 (branches before merging) >

Re: [OCLUG-Tech] anyone ever taken training from nobleprog?

2015-05-10 Thread David Manouchehri
I think there's a bit of irony in paying *anything* for Git related training. The man pages and this book pretty much cover everything better than any paid resource. https://git-scm.herokuapp.com/book/en/v2 That company is charging around ~$400/hr. I'm guessing their business model is to mostly do

Re: [OCLUG-Tech] centos php issue / possibly SELinux

2015-04-19 Thread David Manouchehri
Can you run this on the folder(s) that contain your PHP files? find /tmp/ -ls If anything there doesn't have the read and/or execute flag set, that's probably your problem. I know you've probably already checked this, but it's an easy thing to miss. If you want to recursively set all your PHP fil