webmozart

#!/bin/bash
COMMIT=$1
BRANCH=$2

if [ -z $BRANCH ]; then
    BRANCH="master"
fi

perl -ne 'print if ($seen{$_} .= @ARGV) =~ /10$/' \
    <(git rev-list --ancestry-path --oneline $COMMIT..$BRANCH) \

lavoiesl

<?php
// app/config/assets_version.php

$container->loadFromExtension('framework', array(
    'templating'      => array(
        'engines' => array('twig'),
        'assets_version' => exec('git rev-parse --short HEAD'),
    ),
));

tony4d

Download and install p4merge

• Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
• Copy only the p4merge.app file into your /Applications/ directory

Setup p4merge as a visual mergetool

lavoiesl

<?php

namespace Acme\SiteBundle\Listener;

use Doctrine\ORM\Event\LifecycleEventArgs;
use Acme\SiteBundle\Entity\Comment;

use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;

gzankevich

<?php

namespace Acme\DemoBundle\Entity;

use Doctrine\ORM\Mapping as ORM;

/**
 * @ORM\Entity
 * @ORM\Table(name="folder")
 */

cowlby

{% block collection_widget %}
{% spaceless %}
    <div class="collection">
        {% if prototype is defined %}
            {% set attr = attr|merge({'data-prototype': block('collection_item_widget') }) %}
        {% endif %}
        <div {{ block('widget_container_attributes') }}>
            {{ form_errors(form) }}
            <ul>
            {% for rows in form %}

beberlei

<?php

use Symfony\Component\HttpFoundation\File\File;
use Symfony\Component\HttpFoundation\File\UploadedFile;

/**
 * @Entity
 */
class Document
{