There’s a huge difference between merging master into feature and merging feature into master. So please for those who’s starting learning git – don’t ever make the mistake I made. Don’t disregard the use of --no-ff. In my case, I didn’t disregard it completely, though. I missed adding the flag as I perform git in terminal.

One easy way so you’ll never have to type it again and run the risk of missing it is update your global git config:

git config --global merge.ff false

When merge.ff is set to false, this always creates an extra merge commit, thus it is equivalent to adding --no-ff flag.

One golden use case:

When you revert to your merged IN master, this commit reference is the one you revert to to pull out the changes from your feature.

On July 27 I officially started working for 10up, a well-distributed digital and strategic consulting agency, and knowing that I am based and currently live in the Philippines proves that they(we) are truly expanding globally!

I’ve been a full time freelancer for almost 3 years and the feeling of getting lonely is inherent in the freelance world eventually, at least in my situation. Over the years, I enjoyed the love and hate relationship with the people that I always got to talk to almost everyday — the clients. They’ve given me the  challenges that brought new learnings and some of them bridged ways to creating plugins.

But ever since I started working as a freelancer or even during college times I knew I would like to be part of something great. In fact I feel grateful when I create websites or help businesses build their online home but the experience didn’t come close compared to sharing the challenges and fun if you are part of a team.

I yearn for that moment when, around making our capstone project during senior year, my team had been maximizing all the resources we could get and poured everything we have for a project. It’s inspiring to see all efforts coming together towards a common goal, and seeing them looking up to each other is another reason to be grateful at what we’re doing.

Working with a team, sharing the same passion, can be a far greater and fulfilling experience anyone can ever have in his lifetime. I truly can’t wait to share my life work with 10up, and to contribute in diversifying the team even more and learn from the talented individuals they already have.