I feel the same way about codes of conduct for open source projects as I do about codes of conduct for events. You can absolutely run a totally safe and effective event without one, but by having one you make very clear what your expectations are – and in turn this manages the expectations of the people attending that event. Continue reading
I think it’s a pretty well-rounded collection and it’s only $99 for a couple of weeks, so get the PHP Learning Path here and let me know what you think?
In PHP 5, we already have a ternary operator, which tests a value, and then returns the second element if that returns true and the third if it doesn’t:
echo $count ? $count : 10; // outputs 10
It’s PHPNW time again, and that means hackathon! This conference has a strong tradition of hands-on building as well as the usual talks you’d expect to see, and next week will be no exception to that as there’s a hackathon on Friday night before the main conference on Saturday and Sunday. If you’re at the event then make sure you sign up for your hackathon ticket, it’s always a good experience.
Joind.in is one of the featured projects and I’m one of the maintainers, so I’ll be at the hackathon and I’m hoping that we’ll get quite a few things done during the evening. Joind.in is an ideal project for events like this since it’s easy to get started with it, and we have a development platform virtual machine (that we’ll have already downloaded onto USB sticks so no conference wifi delay) so you can be up and running in no time. We also have a specific label on our bug tracker for items that we think are manageable for people who don’t already know the system, so chances are that if you want to, you’ll be able to contribute to an open source project with something finished by the end of the night. Continue reading
git pull and expect a fast-forward update, but get a merge instead, don’t panic! This usually happens when we’re collaborating on a branch with other people, and we’ve made changes on our local version of a branch, and someone else (or the other you, if you use git to sync between multiple dev platforms) has made changes to the remote version of a branch in the meantime. It also happens really frequently in teams where all commits are to the master branch … yet another reason to have a decent branching strategy.
All that’s happened is something like this:
$ git log --oneline --all --graph --decorate * 054f163 (HEAD, branch1) Installation instructions for the application | * 0ce808c (origin/branch1) Fixing template layout |/ * 927aad9 A random change of 731 to ideas2.txt
Since the last common commit, there are commits on your local branch, and the remote one. You could just let the merge go ahead but there are other options. You could also check out a new branch at this point, reset your tracking branch to the right place and then reapply your changes using cherry-pick or by rebasing and then fast-forward merging your branch. Continue reading