Git – Difference between merge and rebase

Let’s go back to basics: Git.

This powerful versioning tool is hugely underestimated by newcomers because “Oh jeez it’s so hard to understand what’s the difference between git pull origin master and git merge origin/master, and what the hell is this slash in the middle“?

Yeah, just trolling, but actually there’s something awesome we can do and that’s very simple “in the end”: rebasing.

Continue reading “Git – Difference between merge and rebase”

Manage FOSUser in EasyAdmin

EasyAdmin is a powerful backend generator, which creates magic with a simple Yaml file.

However, it has no support of FOSUserBundle, thanks to a specific opinion of the creator not to add too many “bridges” to the bundle for it to be the lightest possible.

But as EasyAdmin is great, we can easily implement users management directly in EasyAdmin.

Continue reading “Manage FOSUser in EasyAdmin”