Should you rebase or merge to update feature branches in git?

Try rebase. If that dissolves into conflict-resolution-hell then give up, merge master into your branch and move on.”
~ Tim Abell