Today I needed to rebase my etnaviv fork to the current master of upstream. I need to say that I never did this before but with git this is a breeze.

If you get a merge conflict during rebase, you only need to follow the instructions git gives you.