I much prefer separate local branches and rebase against master to start the daily workflow. If you are regularly keeping your feature branch on the up to date

I much prefer separate local branches and rebase against master to start the daily workflow. If you are regularly keeping your feature branch on the up to date with master head there is little conflict day to day. When there is a conflict it's because you have to make a decision between two features or collaborator updates and your feature. As long as you haven't pushed your local branch you can rebase it all you want. Way way more organized to use branches.