Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grammar and minor rewrites #350

Closed
wants to merge 8 commits into from
Closed

Conversation

SacredSkull
Copy link
Contributor

Old link to the dotheweb blog was dead, found the new source.

Old link to the dotheweb blog was dead, found the new source.
As each respectable validation library, also Symfony Validator Component allows validations against regular expressions, by using the constraint [Regex](http://symfony.com/doc/current/reference/constraints/Regex.html).
As you can see in Regex constraint documentation, `options` parameter contains a `pattern` key, defining the pattern for validation.
There is only one case we suggest to be careful.
Any respectable validation library (also Symfony Validator Components) allows validations against regular expressions, by using the constraint [Regex](http://symfony.com/doc/current/reference/constraints/Regex.html).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess "Components" should be singular here.

@robin850
Copy link
Member

Thanks for the quick fix @SacredSkull! Would you mind squashing your commits together with git rebase -i HEAD~2 please ? :-)

@SacredSkull
Copy link
Contributor Author

I literally have no idea how to rebase this without causing additional merge conflicts.. You can probably tell that I've never done this before.

@robin850
Copy link
Member

@SacredSkull : Ah sorry, I should certainly have mentioned that you have to do the following:

$ git checkout master
$ git pull --rebase origin master
$ git checkout patch-1
$ git rebase master
$ git rebase -i HEAD~2

Anyway, I don't know whether this is a good practice but most of the time when merge conflicts are resolved but there are a bunch of unwanted merge commits, a solution is to write the diff inside a file, rename the branch to whatever you want (or delete it), create a new one based on master and use git apply with the diff file, then you can git commit.

I just did that with this pull request correctly crediting you. Thank you very much! ❤️

@robin850 robin850 closed this Apr 12, 2015
@SacredSkull
Copy link
Contributor Author

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants