My favourite workflow is feature branches for a about 1-2 days work. If the feature takes longer then split it up into multiple code/code review/merge to master iterations. Use a feature flag if required.
This keeps merge conflicts low and keeps screwing up master to a minimum.
This keeps merge conflicts low and keeps screwing up master to a minimum.