Enable xdebug for local debugging. #63
Conversation
| @@ -26,6 +26,7 @@ Vagrant.configure("2") do |config| | |||
| config.vm.provision :shell, :path => "scripts/apache.sh" | |||
| config.vm.provision :shell, :path => "scripts/mariadb.sh" | |||
| #config.vm.provision :shell, :path => "scripts/php-mcrypt.sh" | |||
| config.vm.provision :shell, :path => "scripts/xdebug.sh" | |||
There was a problem hiding this comment.
Do we want it enabled by default?
There was a problem hiding this comment.
Well, I do, but it might be a matter of what you guys prefer ofcourse.
There was a problem hiding this comment.
I'd opt for commented out as default - we should aim to have default to be the bare min to get up and running. Mailcatcher is a new one and as it prevents us accidentally emailing our live users, I think it's worth having in. This on the otherhand, isn't so critical.
There was a problem hiding this comment.
Ok, will do.
I vaguely remember mailcatcher being suggested by me, but I suggested it more often :)
|
A rebase is now required - sorry @Firesphere! |
|
Heh, no problem. I'll get to it this weekend I hope. A bit busy atm, but I'll try :) |
|
Rebase and changes in a new commit or squashed? (Please say new commit, my previous rebase/squash experience left me horrified and in shock of how it didn't do what I wanted) |
|
I couldn't rebase without new commits. So new commits are now included. I feel stupid :P |
|
If someone would guide me to a way to squashing this, I'd be so happy. I feel like I only make it worse :( |
| ======= | ||
| yum install -y gcc gcc-c++ autoconf automake --enablerepo=epel --enablerepo=webtatic | ||
| >>>>>>> bd45802707205f028b37227aa70fa1eac89494a4 | ||
|
|
There was a problem hiding this comment.
Why, FFS, did this not show up in my conflicts?!
|
Wuh oh! @Firesphere ok, so you need to get your code back to before it went all crazy. The best way to do that is to do When you find the commit hash to go back to do: $ git reset --hard bd45802707205f028b37227aa70fa1eac89494a4
$ git pull --rebase upstream master
$ # fix conflicts
$ git push -fThat should be it. |
|
I think (once this is in) that we can tag rc3 and I can't see much need to change for stable... Though there is that issue with grunt-watch... #69 |
|
I know. SourceTree went totally crazy and made batshit crazy commits and merges. |
Firesphere
force-pushed
the
feature/Enable_Xdebug
branch
from
3dd86fe
to
417b580
Compare
|
Well, I appearantly have some git issues, but this should be it. |
|
Lovely |
Enable xdebug for local debugging.
Before going completely crazy. Here's the final version with only one commit.