Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/episode2/form-class-using-in-the-controller' into '_tuts/episode2/field-options-setting-required-to-false' as we walk forward through the steps

------------------------------

Moving options to email field
Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/episode2/field-options-setting-required-to-false' into '_tuts/episode2/field-options-label-and-attr' as we walk forward through the steps

------------------------------

Moving options to email and updating label and class name
Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/episode2/field-guessing-remove-novalidate' into '_tuts/episode2/field-guessing-making-email-not-required' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-remove-novalidate' into '_tuts/episode2/field-guessing-making-email-not-required' as we walk forward through the steps

Conflicts:
	src/Yoda/UserBundle/Form/RegisterFormType.php
Changes from 2 commit(s):

TutsHero: Merge branch '_tuts/episode2/field-guessing-swap-notblank-for-nullable-false' into '_tuts/episode2/field-guessing-re-add-type' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-swap-notblank-for-nullable-false' into '_tuts/episode2/field-guessing-re-add-type' as we walk forward through the steps

Conflicts:
	src/Yoda/UserBundle/Form/RegisterFormType.php
Tuts: Updating steps on compile
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/episode2/form-submit-no-issubmitted' into '_tuts/episode2/form-data-passing-array-default-data' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/form-submit-no-issubmitted' into _tuts/episode2/form-data-passing-array-default-data

------------------------------

Updating default username
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/episode2/form-data-passing-array-default-data' into '_tuts/episode2/form-data-adding-data-class' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/form-data-passing-array-default-data' into _tuts/episode2/form-data-adding-data-class

------------------------------

TutsHero: Merge branch '_tuts/episode2/form-data-passing-array-default-data' into '_tuts/episode2/form-data-adding-data-class' as we walk forward through the steps

Conflicts:
	src/Yoda/UserBundle/Controller/RegisterController.php
Changes from 4 commit(s):

TutsHero: Merge branch '_tuts/episode2/form-data-simplify-user-creation' into '_tuts/episode2/form-data-putting-back-array-default-data' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/form-data-simplify-user-creation' into _tuts/episode2/form-data-putting-back-array-default-data

------------------------------

TutsHero: Merge branch '_tuts/episode2/form-data-simplify-user-creation' into '_tuts/episode2/form-data-putting-back-array-default-data' as we walk forward through the steps

------------------------------

Changing default data to Leia
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/episode2/form-data-putting-back-array-default-data' into '_tuts/episode2/form-data-user-object-default-data' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/form-data-putting-back-array-default-data' into _tuts/episode2/form-data-user-object-default-data

------------------------------

TutsHero: Merge branch '_tuts/episode2/form-data-putting-back-array-default-data' into '_tuts/episode2/form-data-user-object-default-data' as we walk forward through the steps

Conflicts:
	src/Yoda/UserBundle/Controller/RegisterController.php
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/episode2/plainpassword-populating-erasecredentials' into '_tuts/episode2/plainpassword-using-in-the-form' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/plainpassword-populating-erasecredentials' into _tuts/episode2/plainpassword-using-in-the-form

------------------------------

TutsHero: Merge branch '_tuts/episode2/plainpassword-populating-erasecredentials' into '_tuts/episode2/plainpassword-using-in-the-form' as we walk forward through the steps
Changes from 3 commit(s):

TutsHero: Merge branch '_tuts/episode2/form-class-filling-in-the-guts' into '_tuts/episode2/form-class-using-in-the-controller' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/form-class-filling-in-the-guts' into _tuts/episode2/form-class-using-in-the-controller

------------------------------

TutsHero: Merge branch '_tuts/episode2/form-class-filling-in-the-guts' into '_tuts/episode2/form-class-using-in-the-controller' as we walk forward through the steps
Changes from 5 commit(s):

TutsHero: Merge branch '_tuts/episode2/validation-basic-notblank-constraint' into '_tuts/episode2/validation-customizing-the-message' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/validation-basic-notblank-constraint' into '_tuts/episode2/validation-customizing-the-message' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/validation-basic-notblank-constraint' into _tuts/episode2/validation-customizing-the-message

------------------------------

TutsHero: Merge branch '_tuts/episode2/validation-basic-notblank-constraint' into '_tuts/episode2/validation-customizing-the-message' as we walk forward through the steps

------------------------------

Making validation message more epic
Changes from 4 commit(s):

TutsHero: Merge branch '_tuts/episode2/validation-customizing-the-message' into '_tuts/episode2/validation-adding-the-other-constraints' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/validation-customizing-the-message' into '_tuts/episode2/validation-adding-the-other-constraints' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/validation-customizing-the-message' into _tuts/episode2/validation-adding-the-other-constraints

------------------------------

TutsHero: Merge branch '_tuts/episode2/validation-customizing-the-message' into '_tuts/episode2/validation-adding-the-other-constraints' as we walk forward through the steps

Conflicts:
	src/Yoda/UserBundle/Entity/User.php
Changes from 4 commit(s):

TutsHero: Merge branch '_tuts/episode2/validation-adding-the-other-constraints' into '_tuts/episode2/validation-uniqueentity' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/validation-adding-the-other-constraints' into '_tuts/episode2/validation-uniqueentity' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/validation-adding-the-other-constraints' into _tuts/episode2/validation-uniqueentity

------------------------------

TutsHero: Merge branch '_tuts/episode2/validation-adding-the-other-constraints' into '_tuts/episode2/validation-uniqueentity' as we walk forward through the steps
Changes from 5 commit(s):

TutsHero: Merge branch '_tuts/episode2/validation-uniqueentity' into '_tuts/episode2/flash-setting-the-message' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/validation-uniqueentity' into '_tuts/episode2/flash-setting-the-message' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/validation-uniqueentity' into _tuts/episode2/flash-setting-the-message

------------------------------

TutsHero: Merge branch '_tuts/episode2/validation-uniqueentity' into '_tuts/episode2/flash-setting-the-message' as we walk forward through the steps

------------------------------

Making flash message more epic
Changes from 4 commit(s):

TutsHero: Merge branch '_tuts/episode2/flash-setting-the-message' into '_tuts/episode2/autologin-adding-everything-for-logging-in' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/flash-setting-the-message' into '_tuts/episode2/autologin-adding-everything-for-logging-in' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/flash-setting-the-message' into _tuts/episode2/autologin-adding-everything-for-logging-in

------------------------------

TutsHero: Merge branch '_tuts/episode2/flash-setting-the-message' into '_tuts/episode2/autologin-adding-everything-for-logging-in' as we walk forward through the steps
Changes from 4 commit(s):

TutsHero: Merge branch '_tuts/episode2/field-guessing-remove-novalidate' into '_tuts/episode2/field-guessing-making-email-not-required' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-remove-novalidate' into '_tuts/episode2/field-guessing-making-email-not-required' as we walk forward through the steps

Conflicts:
	src/Yoda/UserBundle/Form/RegisterFormType.php

------------------------------

Merge branch '_tuts/episode2/field-guessing-remove-novalidate' into _tuts/episode2/field-guessing-making-email-not-required

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-remove-novalidate' into '_tuts/episode2/field-guessing-making-email-not-required' as we walk forward through the steps
Changes from 4 commit(s):

TutsHero: Merge branch '_tuts/episode2/field-guessing-making-email-not-required' into '_tuts/episode2/field-guessing-remove-email-constraint' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-making-email-not-required' into '_tuts/episode2/field-guessing-remove-email-constraint' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/field-guessing-making-email-not-required' into _tuts/episode2/field-guessing-remove-email-constraint

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-making-email-not-required' into '_tuts/episode2/field-guessing-remove-email-constraint' as we walk forward through the steps
Changes from 4 commit(s):

TutsHero: Merge branch '_tuts/episode2/field-guessing-remove-email-constraint' into '_tuts/episode2/field-guessing-add-back-notblank' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-remove-email-constraint' into '_tuts/episode2/field-guessing-add-back-notblank' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/field-guessing-remove-email-constraint' into _tuts/episode2/field-guessing-add-back-notblank

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-remove-email-constraint' into '_tuts/episode2/field-guessing-add-back-notblank' as we walk forward through the steps
Changes from 4 commit(s):

TutsHero: Merge branch '_tuts/episode2/field-guessing-add-back-notblank' into '_tuts/episode2/field-guessing-swap-notblank-for-nullable-false' as we walk forward through the steps

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-add-back-notblank' into '_tuts/episode2/field-guessing-swap-notblank-for-nullable-false' as we walk forward through the steps

------------------------------

Merge branch '_tuts/episode2/field-guessing-add-back-notblank' into _tuts/episode2/field-guessing-swap-notblank-for-nullable-false

------------------------------

TutsHero: Merge branch '_tuts/episode2/field-guessing-add-back-notblank' into '_tuts/episode2/field-guessing-swap-notblank-for-nullable-false' as we walk forward through the steps